From c27b56c6927642157f0c392faca6c9fcba9750d0 Mon Sep 17 00:00:00 2001 From: Jisi Liu Date: Tue, 15 Aug 2017 14:58:38 -0700 Subject: Merge pull request #3494 from drivehappy/clang_warning_macro Fixing -Wexpansion-to-defined Clang warning --- src/google/protobuf/stubs/port.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/google') diff --git a/src/google/protobuf/stubs/port.h b/src/google/protobuf/stubs/port.h index dbc29861..0f304c6b 100644 --- a/src/google/protobuf/stubs/port.h +++ b/src/google/protobuf/stubs/port.h @@ -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 -- cgit v1.2.3