Skip to content

P
protobuf
Commit bc3af606 authored by Feng Xiao's avatar Feng Xiao
Browse files
Options

Merge pull request #139 from c0nk/master 

Improved little endian byte order detection
parents 59692c3f c3e92802
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 1 deletion
src/google/protobuf/io/coded_stream.h
View file @ bc3af606
...@@ -123,7 +123,8 @@ ...@@ -123,7 +123,8 @@
#endif #endif
#else #else
#include <sys/param.h> // __BYTE_ORDER #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) !defined(PROTOBUF_DISABLE_LITTLE_ENDIAN_OPT_FOR_TEST)
#define PROTOBUF_LITTLE_ENDIAN 1 #define PROTOBUF_LITTLE_ENDIAN 1
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment