]> git.pld-linux.org Git - packages/OpenImageIO.git/blob - fix-types.patch
- updated files and BRs
[packages/OpenImageIO.git] / fix-types.patch
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
3 @@ -103,6 +103,8 @@
4  #include <stdlib.h>
5  #endif
6  
7 +#include <cinttypes>
8 +
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
12 @@ -156,7 +158,7 @@
13  #ifdef _MSC_VER // Compiling with Microsoft compiler
14  #define UINT_8  unsigned __int8
15  #else // !_MSC_VER
16 -#define UINT_8 unsigned char
17 +#define UINT_8 uint8_t
18  #endif // _MSC_VER
19  #endif
20  
21 @@ -164,11 +166,7 @@
22  #ifdef _MSC_VER // Compiling with Microsoft compiler
23  #define UINT_32 unsigned __int32
24  #else // !_MSC_VER
25 -#if (ULONG_MAX == 0xFFFFFFFF)
26 -#define UINT_32 unsigned long
27 -#else
28 -#define UINT_32 unsigned int
29 -#endif
30 +#define UINT_32 uint32_t
31  #endif // _MSC_VER
32  #endif // UINT_32
33  
34 @@ -176,7 +174,7 @@
35  #ifdef _MSC_VER // Compiling with Microsoft compiler
36  #define INT_64 __int64
37  #else // !_MSC_VER
38 -#define INT_64 long long
39 +#define INT_64 int64_t
40  #endif // _MSC_VER
41  #endif // INT_64
42  
43 @@ -184,7 +182,7 @@
44  #ifdef _MSC_VER // Compiling with Microsoft compiler
45  #define UINT_64 unsigned __int64
46  #else // !_MSC_VER
47 -#define UINT_64 unsigned long long
48 +#define UINT_64 uint64_t
49  #endif // _MSC_VER
50  #endif // UINT_64
51  
This page took 0.970954 seconds and 3 git commands to generate.