Attachment #860114 for bug #901467

View | Details | Raw Unified | Return to bug 901467
Collapse All | Expand All





#include "../7zTypes.h"

#include <stdint.h>
typedef UInt32 uint32_t;
#define _UINT32_T_DECLARED
#endif

#ifndef _UINT64_T_DECLARED
typedef UInt64 uint64_t;
#define _UINT64_T_DECLARED
#endif

//#include <stdint.h>

#ifndef min
#define min(a,b) (((a)>(b))?(b):(a))

Return to bug 901467

Lines 42-58 Link Here

(-)p7zip-17.05-orig/C/hashes/hash.h (-11 / +1 lines)
42		42
43	#include "../7zTypes.h"	43	#include "../7zTypes.h"
44		44
45	#ifndef _UINT32_T_DECLARED	45	#include <stdint.h>
46	typedef UInt32 uint32_t;
47	#define _UINT32_T_DECLARED
48	#endif
49
50	#ifndef _UINT64_T_DECLARED
51	typedef UInt64 uint64_t;
52	#define _UINT64_T_DECLARED
53	#endif
54
55	//#include <stdint.h>
56		46
57	#ifndef min	47	#ifndef min
58	#define min(a,b) (((a)>(b))?(b):(a))	48	#define min(a,b) (((a)>(b))?(b):(a))