Merge pull request #139 from c0nk/master

Improved little endian byte order detection

Merge pull request #139 from c0nk/master
Improved little endian byte order detection
bc3af606 · Feng Xiao · 59692c3f · c3e92802 · bc3af606
Commit bc3af606 authored Dec 21, 2014 by Feng Xiao
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

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

No files found.
--- a/src/google/protobuf/io/coded_stream.h
+++ b/src/google/protobuf/io/coded_stream.h
@@ -123,7 +123,8 @@
  #endif
 #else
  #include <sys/param.h>   // __BYTE_ORDER
-  #if defined(__BYTE_ORDER) && __BYTE_ORDER == __LITTLE_ENDIAN && \
+  #if ((defined(__LITTLE_ENDIAN__) && !defined(__BIG_ENDIAN__)) || \
+         (defined(__BYTE_ORDER) && __BYTE_ORDER == __LITTLE_ENDIAN)) && \
      !defined(PROTOBUF_DISABLE_LITTLE_ENDIAN_OPT_FOR_TEST)
    #define PROTOBUF_LITTLE_ENDIAN 1
  #endif