diff options
| author | Feng Xiao <xiaofeng@google.com> | 2015-08-26 14:43:04 -0700 |
|---|---|---|
| committer | Feng Xiao <xiaofeng@google.com> | 2015-08-26 14:43:04 -0700 |
| commit | 047a97ff446cb854f6fc3a9e5277ecc2f79ea47f (patch) | |
| tree | 3f37ef4e9b06871d28bf7f7c4da69daba74ea8e6 | |
| parent | d7d9accc1d2acfa35e5765150f1ac9dcdf34637a (diff) | |
| parent | d9f4636818e6f935df98c17d875217210a123917 (diff) | |
| download | protobuf-047a97ff446cb854f6fc3a9e5277ecc2f79ea47f.tar.gz protobuf-047a97ff446cb854f6fc3a9e5277ecc2f79ea47f.tar.bz2 protobuf-047a97ff446cb854f6fc3a9e5277ecc2f79ea47f.zip | |
Merge pull request #749 from xfxyjwf/mingw_endian
Assume LITTLE_ENDIAN for windows build
| -rw-r--r-- | src/google/protobuf/stubs/port.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/google/protobuf/stubs/port.h b/src/google/protobuf/stubs/port.h index 5158a6f9..9ea34cde 100644 --- a/src/google/protobuf/stubs/port.h +++ b/src/google/protobuf/stubs/port.h @@ -45,12 +45,15 @@ #endif #undef PROTOBUF_LITTLE_ENDIAN -#ifdef _MSC_VER +#ifdef _WIN32 // Assuming windows is always little-endian. + // TODO(xiaofeng): The PROTOBUF_LITTLE_ENDIAN is not only used for + // optimization but also for correctness. We should define an + // different macro to test the big-endian code path in coded_stream. #if !defined(PROTOBUF_DISABLE_LITTLE_ENDIAN_OPT_FOR_TEST) #define PROTOBUF_LITTLE_ENDIAN 1 #endif - #if _MSC_VER >= 1300 + #if defined(_MSC_VER) && _MSC_VER >= 1300 // If MSVC has "/RTCc" set, it will complain about truncating casts at // runtime. This file contains some intentional truncating casts. #pragma runtime_checks("c", off) |