Merge pull request #651 from litinglin/master

On x64 MSVC platform, macro PROTOBUF_LITTLE_ENDIAN won't be set

Merge pull request #651 from litinglin/master
On x64 MSVC platform, macro PROTOBUF_LITTLE_ENDIAN won't be set
add3e8df · Feng Xiao · f642c5cf · 67d51ac4 · add3e8df
Commit add3e8df authored Jul 29, 2015 by Feng Xiao
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

coded_stream.h src/google/protobuf/io/coded_stream.h +2 -2

No files found.
--- a/src/google/protobuf/io/coded_stream.h
+++ b/src/google/protobuf/io/coded_stream.h
@@ -112,8 +112,8 @@
 #include <string>
 #include <utility>
 #ifdef _MSC_VER
-  #if defined(_M_IX86) && \
-      !defined(PROTOBUF_DISABLE_LITTLE_ENDIAN_OPT_FOR_TEST)
+  // Assuming windows is always little-endian.
+  #if !defined(PROTOBUF_DISABLE_LITTLE_ENDIAN_OPT_FOR_TEST)
    #define PROTOBUF_LITTLE_ENDIAN 1
  #endif
  #if _MSC_VER >= 1300