diff options
| author |  Bo Yang <teboring@google.com> | 2015-07-06 16:07:57 -0700 |
|---|---|---|
| committer | Bo Yang <teboring@google.com> | 2015-07-09 12:39:52 -0700 |
| commit | 9f563bd0d8863da35524f7d0a6f87abb2ec228a3 (patch) | |
| tree | 8475f940f97422dcba951238e93b16f223d94f0b /src/google/protobuf/stubs/common.h | |
| parent | 5a020d41a55d2ad44bf0e84c74ba91758ef5d016 (diff) | |
Internal local modifications.
Diffstat (limited to 'src/google/protobuf/stubs/common.h')
| -rw-r--r-- | src/google/protobuf/stubs/common.h | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/src/google/protobuf/stubs/common.h b/src/google/protobuf/stubs/common.h index 3eb57a9b..3a081e60 100644 --- a/src/google/protobuf/stubs/common.h +++ b/src/google/protobuf/stubs/common.h @@ -203,14 +203,22 @@ typedef unsigned __int16 uint16; typedef unsigned __int32 uint32; typedef unsigned __int64 uint64; #else -typedef int8_t int8; -typedef int16_t int16; -typedef int32_t int32; +typedef signed char int8; +typedef short int16; +typedef int int32; +// NOTE: This should be "long long" for consistency with upstream, but +// something is stacked against this particular type for 64bit hashing. +// Switching it causes an obvious missing hash function (with an unobvious +// cause) when building the tests. typedef int64_t int64; -typedef uint8_t uint8; -typedef uint16_t uint16; -typedef uint32_t uint32; +typedef unsigned char uint8; +typedef unsigned short uint16; +typedef unsigned int uint32; +// NOTE: This should be "unsigned long long" for consistency with upstream, but +// something is stacked against this particular type for 64bit hashing. +// Switching it causes an obvious missing hash function (with an unobvious +// cause) when building the tests. typedef uint64_t uint64; #endif |