Merge pull request #651 from litinglin/master

On x64 MSVC platform, macro PROTOBUF_LITTLE_ENDIAN won't be set
This commit is contained in:
Feng Xiao 2015-07-29 13:47:09 -07:00
commit add3e8df57

View file

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