diff options
| author | Feng Xiao <xiaofeng@google.com> | 2016-05-11 10:30:41 -0700 |
|---|---|---|
| committer | Feng Xiao <xiaofeng@google.com> | 2016-05-11 10:30:41 -0700 |
| commit | 920ee735cfab0203292a3d3ff0065a0db4e9588f (patch) | |
| tree | c3f17e54b7af4258dfbba74477b77415eafbfb53 /src | |
| parent | cca2d44ef10bc338e59884d0918c42e05b02d4bd (diff) | |
| parent | f4bc9e0ddbdb3746c4b591ffe0b3fe2e4680a83d (diff) | |
| download | protobuf-920ee735cfab0203292a3d3ff0065a0db4e9588f.tar.gz protobuf-920ee735cfab0203292a3d3ff0065a0db4e9588f.tar.bz2 protobuf-920ee735cfab0203292a3d3ff0065a0db4e9588f.zip | |
Merge pull request #1483 from wal-rus/fix-boost-incompatibility
Fix C++ Boost incompatibility on Windows/MSVC
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) |