organicmaps/protobuf
13
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

Merge pull request #1483 from wal-rus/fix-boost-incompatibility

Browse source 
Fix C++ Boost incompatibility on Windows/MSVC
This commit is contained in:
Feng Xiao 2016-05-11 10:30:41 -07:00
commit 920ee735cf
1 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/google/protobuf/stubs/port.h
View file

@ -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)