From a61e7b5f06c26ba74b7ca032a6c41cdd9cdc6a0e Mon Sep 17 00:00:00 2001 From: Aaron Gao Date: Wed, 24 May 2017 18:18:24 -0700 Subject: [PATCH] Revert "remove #include port/port.h in public header file" This reverts commit 4c9d2b10468146f42facb98fbc55d31501036d6a. --- include/rocksdb/iostats_context.h | 8 ++------ include/rocksdb/perf_context.h | 6 +----- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/include/rocksdb/iostats_context.h b/include/rocksdb/iostats_context.h index d0dbfa5f..7be3afa5 100644 --- a/include/rocksdb/iostats_context.h +++ b/include/rocksdb/iostats_context.h @@ -7,6 +7,7 @@ #include #include +#include "port/port.h" #include "rocksdb/perf_level.h" // A thread local context for gathering io-stats efficiently and transparently. @@ -47,12 +48,7 @@ struct IOStatsContext { }; #ifdef ROCKSDB_SUPPORT_THREAD_LOCAL - #if defined(_MSC_VER) && !defined(__thread) - // Thread local storage on Linux - // There is thread_local in C++11 - #define __thread __declspec(thread) - #endif - extern __thread IOStatsContext iostats_context; +extern __thread IOStatsContext iostats_context; #endif } // namespace rocksdb diff --git a/include/rocksdb/perf_context.h b/include/rocksdb/perf_context.h index 785dfc7c..e3c86c39 100644 --- a/include/rocksdb/perf_context.h +++ b/include/rocksdb/perf_context.h @@ -9,6 +9,7 @@ #include #include +#include "port/port.h" #include "rocksdb/perf_level.h" namespace rocksdb { @@ -157,11 +158,6 @@ extern PerfContext perf_context; PerfContext *getPerfContext(); #define perf_context (*getPerfContext()) #else - #if defined(_MSC_VER) && !defined(__thread) - // Thread local storage on Linux - // There is thread_local in C++11 - #define __thread __declspec(thread) - #endif extern __thread PerfContext perf_context; #endif #endif -- 2.47.3