1 --- OpenImageIO-oiio-4070df8/src/include/OpenImageIO/SHA1.h.orig 2015-12-26 10:27:30.663439300 +0100
2 +++ OpenImageIO-oiio-4070df8/src/include/OpenImageIO/SHA1.h 2015-12-26 10:32:29.409487767 +0100
9 // You can define the endian mode in your files without modifying the SHA-1
10 // source files. Just #define SHA1_LITTLE_ENDIAN or #define SHA1_BIG_ENDIAN
11 // in your files, before including the SHA1.h header file. If you don't
13 #ifdef _MSC_VER // Compiling with Microsoft compiler
14 #define UINT_8 unsigned __int8
16 -#define UINT_8 unsigned char
17 +#define UINT_8 uint8_t
22 #ifdef _MSC_VER // Compiling with Microsoft compiler
23 #define UINT_32 unsigned __int32
25 -#if (ULONG_MAX == 0xFFFFFFFF)
26 -#define UINT_32 unsigned long
28 -#define UINT_32 unsigned int
30 +#define UINT_32 uint32_t
35 #ifdef _MSC_VER // Compiling with Microsoft compiler
36 #define INT_64 __int64
38 -#define INT_64 long long
39 +#define INT_64 int64_t
44 #ifdef _MSC_VER // Compiling with Microsoft compiler
45 #define UINT_64 unsigned __int64
47 -#define UINT_64 unsigned long long
48 +#define UINT_64 uint64_t