--- p7zip-17.05/C/hashes/hash.h.old 2024-11-16 12:00:39.359638828 -0500 +++ p7zip-17.05/C/hashes/hash.h 2024-11-16 18:01:43.114402159 -0500 @@ -42,17 +42,17 @@ #include "../7zTypes.h" -#ifndef _UINT32_T_DECLARED -typedef UInt32 uint32_t; -#define _UINT32_T_DECLARED -#endif +// #ifndef _UINT32_T_DECLARED +// typedef UInt32 uint32_t; +// #define _UINT32_T_DECLARED +// #endif -#ifndef _UINT64_T_DECLARED -typedef UInt64 uint64_t; -#define _UINT64_T_DECLARED -#endif +// #ifndef _UINT64_T_DECLARED +// typedef UInt64 uint64_t; +// #define _UINT64_T_DECLARED +// #endif -//#include +#include #ifndef min #define min(a,b) (((a)>(b))?(b):(a))