浏览代码

Merge pull request #3494 from drivehappy/clang_warning_macro

Fixing -Wexpansion-to-defined Clang warning
Jisi Liu 8 年之前
父节点
当前提交
5e39ecc569
共有 1 个文件被更改,包括 5 次插入2 次删除
  1. 5 2
      src/google/protobuf/stubs/port.h

+ 5 - 2
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