]> git-server-git.apps.pok.os.sepia.ceph.com Git - rocksdb.git/commitdiff
util/thread_local.h: silence a clang-build warning wip-rocksdb
authorKefu Chai <tchaikov@gmail.com>
Mon, 9 Jan 2017 08:54:06 +0000 (16:54 +0800)
committerKefu Chai <tchaikov@gmail.com>
Thu, 12 Jan 2017 16:26:19 +0000 (00:26 +0800)
otherwise clang complains with

/home/jenkins/workspace/ceph-master/src/rocksdb/util/thread_local.h:205:5:
error: macro expansion producing 'defined' has undefined behavior
[-Werror,-Wexpansion-to-defined]
^
/home/jenkins/workspace/ceph-master/src/rocksdb/util/thread_local.h:22:4:
note: expanded from macro 'ROCKSDB_SUPPORT_THREAD_LOCAL'
!defined(OS_WIN) && !defined(OS_MACOSX) && !defined(IOS_CROSS_COMPILE)
^`

Signed-off-by: Kefu Chai <tchaikov@gmail.com>
util/thread_local.h

index 5806b544e2ee4c2f2c17b4d0c15257b0b27dd570..107c262b1f5f18d454ce1b0d986c4ea332293c91 100644 (file)
 #include "port/port.h"
 
 #ifndef ROCKSDB_SUPPORT_THREAD_LOCAL
-#define ROCKSDB_SUPPORT_THREAD_LOCAL \
-  !defined(OS_WIN) && !defined(OS_MACOSX) && !defined(IOS_CROSS_COMPILE)
+#  if defined(OS_WIN) || defined(OS_MACOSX) || defined(IOS_CROSS_COMPILE)
+#    define ROCKSDB_SUPPORT_THREAD_LOCAL 0
+#  else
+#    define ROCKSDB_SUPPORT_THREAD_LOCAL 1
+#  endif
 #endif
 
 namespace rocksdb {