Merge pull request #3494 from drivehappy/clang_warning_macro

Fixing -Wexpansion-to-defined Clang warning
This commit is contained in:
Jisi Liu 2017-08-15 14:58:38 -07:00 committed by drivehappy
parent 92d768c113
commit c27b56c692

View File

@ -256,8 +256,11 @@ static const uint64 kuint64max = GOOGLE_ULONGLONG(0xFFFFFFFFFFFFFFFF);
# define GOOGLE_PROTOBUF_USE_UNALIGNED 0
#else
// x86 and x86-64 can perform unaligned loads/stores directly.
# define GOOGLE_PROTOBUF_USE_UNALIGNED defined(_M_X64) || \
defined(__x86_64__) || defined(_M_IX86) || defined(__i386__)
# if defined(_M_X64) || defined(__x86_64__) || defined(_M_IX86) || defined(__i386__)
# define GOOGLE_PROTOBUF_USE_UNALIGNED 1
# else
# define GOOGLE_PROTOBUF_USE_UNALIGNED 0
# endif
#endif
#if GOOGLE_PROTOBUF_USE_UNALIGNED