From: Kefu Chai <tchaikov@gmail.com>
Date: Mon, 9 Jan 2017 08:54:06 +0000 (+0800)
Subject: util/thread_local.h: silence a clang-build warning
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fheads%2Fwip-rocksdb;p=rocksdb.git

util/thread_local.h: silence a clang-build warning

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

diff --git a/util/thread_local.h b/util/thread_local.h
index 5806b544..107c262b 100644
--- a/util/thread_local.h
+++ b/util/thread_local.h
@@ -18,8 +18,11 @@
 #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 {