OLD | NEW |
1 --- protobuf-cleaned/src/google/protobuf/stubs/port.h 2015-12-30 13:21:46.0000
00000 -0800 | 1 --- protobuf-cleaned/src/google/protobuf/stubs/port.h 2015-12-30 13:21:46.0000
00000 -0800 |
2 +++ protobuf-patched/src/google/protobuf/stubs/port.h 2016-03-31 13:25:26.8400
24811 -0700 | 2 +++ protobuf-patched/src/google/protobuf/stubs/port.h 2016-03-31 13:25:26.8400
24811 -0700 |
3 @@ -66,18 +66,34 @@ | 3 @@ -66,18 +66,34 @@ |
4 #define PROTOBUF_LITTLE_ENDIAN 1 | 4 #define PROTOBUF_LITTLE_ENDIAN 1 |
5 #endif | 5 #endif |
6 #endif | 6 #endif |
7 -#if defined(_MSC_VER) && defined(PROTOBUF_USE_DLLS) | 7 -#if defined(_MSC_VER) && defined(PROTOBUF_USE_DLLS) |
8 - #ifdef LIBPROTOBUF_EXPORTS | 8 - #ifdef LIBPROTOBUF_EXPORTS |
9 - #define LIBPROTOBUF_EXPORT __declspec(dllexport) | 9 - #define LIBPROTOBUF_EXPORT __declspec(dllexport) |
10 - #else | 10 - #else |
(...skipping 28 matching lines...) Expand all Loading... |
39 + #define LIBPROTOC_EXPORT __attribute__((visibility("default"))) | 39 + #define LIBPROTOC_EXPORT __attribute__((visibility("default"))) |
40 + #else | 40 + #else |
41 + #define LIBPROTOC_EXPORT | 41 + #define LIBPROTOC_EXPORT |
42 + #endif | 42 + #endif |
43 #endif | 43 #endif |
44 -#else | 44 -#else |
45 +#else // defined(COMPONENT_BUILD) && defined(PROTOBUF_USE_DLLS) | 45 +#else // defined(COMPONENT_BUILD) && defined(PROTOBUF_USE_DLLS) |
46 #define LIBPROTOBUF_EXPORT | 46 #define LIBPROTOBUF_EXPORT |
47 #define LIBPROTOC_EXPORT | 47 #define LIBPROTOC_EXPORT |
48 #endif | 48 #endif |
49 @@ -149,9 +149,9 @@ | 49 @@ -109,15 +125,15 @@ |
| 50 typedef unsigned __int32 uint32; |
| 51 typedef unsigned __int64 uint64; |
| 52 #else |
| 53 -typedef signed char int8; |
| 54 -typedef short int16; |
| 55 -typedef int int32; |
| 56 -typedef long long int64; |
| 57 - |
| 58 -typedef unsigned char uint8; |
| 59 -typedef unsigned short uint16; |
| 60 -typedef unsigned int uint32; |
| 61 -typedef unsigned long long uint64; |
| 62 +typedef int8_t int8; |
| 63 +typedef int16_t int16; |
| 64 +typedef int32_t int32; |
| 65 +typedef int64_t int64; |
| 66 + |
| 67 +typedef uint8_t uint8; |
| 68 +typedef uint16_t uint16; |
| 69 +typedef uint32_t uint32; |
| 70 +typedef uint64_t uint64; |
| 71 #endif |
| 72 |
| 73 // long long macros to be used because gcc and vc++ use different suffixes, |
| 74 @@ -131,8 +147,8 @@ |
| 75 #define GOOGLE_ULONGLONG(x) x##UI64 |
50 #define GOOGLE_LL_FORMAT "I64" // As in printf("%I64d", ...) | 76 #define GOOGLE_LL_FORMAT "I64" // As in printf("%I64d", ...) |
51 #else | 77 #else |
52 // By long long, we actually mean int64. | |
53 -#define GOOGLE_LONGLONG(x) x##LL | 78 -#define GOOGLE_LONGLONG(x) x##LL |
54 -#define GOOGLE_ULONGLONG(x) x##ULL | 79 -#define GOOGLE_ULONGLONG(x) x##ULL |
55 +#define GOOGLE_LONGLONG(x) INT64_C(x) | 80 +#define GOOGLE_LONGLONG(x) INT64_C(x) |
56 +#define GOOGLE_ULONGLONG(x) UINT64_C(x) | 81 +#define GOOGLE_ULONGLONG(x) UINT64_C(x) |
57 // Used to format real long long integers. | |
58 #define GOOGLE_LL_FORMAT "ll" // As in "%lld". Note that "q" is poor form also
. | 82 #define GOOGLE_LL_FORMAT "ll" // As in "%lld". Note that "q" is poor form also
. |
59 #endif | 83 #endif |
60 | 84 |
OLD | NEW |