diff options
| author | Walter Gray <wgray@leapmotion.com> | 2016-05-03 19:26:03 -0700 |
|---|---|---|
| committer | Walter Gray <wgray@leapmotion.com> | 2016-05-06 17:13:02 -0700 |
| commit | f4bc9e0ddbdb3746c4b591ffe0b3fe2e4680a83d (patch) | |
| tree | 2438cc5f361247372f347ff2ad7378c0fe16aaaf /src | |
| parent | 72e162ce96fcd153654a1ab7a26b67ab7278580b (diff) | |
| download | protobuf-f4bc9e0ddbdb3746c4b591ffe0b3fe2e4680a83d.tar.gz protobuf-f4bc9e0ddbdb3746c4b591ffe0b3fe2e4680a83d.tar.bz2 protobuf-f4bc9e0ddbdb3746c4b591ffe0b3fe2e4680a83d.zip | |
Remove confounding and unused #define - breaks boost/predef/other/endian.h
Diffstat (limited to 'src')
| -rw-r--r-- | src/google/protobuf/stubs/port.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/google/protobuf/stubs/port.h b/src/google/protobuf/stubs/port.h index 1036dff1..0e65fc8f 100644 --- a/src/google/protobuf/stubs/port.h +++ b/src/google/protobuf/stubs/port.h @@ -276,10 +276,8 @@ inline void GOOGLE_UNALIGNED_STORE64(void *p, uint64 v) { #define GOOGLE_THREAD_LOCAL __thread #endif -// The following guarantees declaration of the byte swap functions, and -// defines __BYTE_ORDER for MSVC +// The following guarantees declaration of the byte swap functions. #ifdef _MSC_VER -#define __BYTE_ORDER __LITTLE_ENDIAN #define bswap_16(x) _byteswap_ushort(x) #define bswap_32(x) _byteswap_ulong(x) #define bswap_64(x) _byteswap_uint64(x) |