AuroraMiddleware/protobuf
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Merge pull request #1261 from gjasny/disable-tls-for-osx-10.6

Browse Source 
Disable thread local storage for OSX < 10.7
This commit is contained in:
Adam Cozzette 2018-06-20 13:02:16 -07:00 committed by GitHub
commit 85ba13c9bf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/google/protobuf/stubs/platform_macros.h
View File

@ -99,6 +99,7 @@ GOOGLE_PROTOBUF_PLATFORM_ERROR
#if defined(__APPLE__) #if defined(__APPLE__)
#define GOOGLE_PROTOBUF_OS_APPLE #define GOOGLE_PROTOBUF_OS_APPLE
#include <Availability.h>
#include <TargetConditionals.h> #include <TargetConditionals.h>
#if TARGET_OS_IPHONE #if TARGET_OS_IPHONE
#define GOOGLE_PROTOBUF_OS_IPHONE #define GOOGLE_PROTOBUF_OS_IPHONE
@ -125,4 +126,9 @@ GOOGLE_PROTOBUF_PLATFORM_ERROR
#define GOOGLE_PROTOBUF_NO_THREADLOCAL #define GOOGLE_PROTOBUF_NO_THREADLOCAL
#endif #endif
#if defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && __MAC_OS_X_VERSION_MIN_REQUIRED < 1070
// __thread keyword requires at least 10.7
#define GOOGLE_PROTOBUF_NO_THREADLOCAL
#endif
#endif // GOOGLE_PROTOBUF_PLATFORM_MACROS_H_ #endif // GOOGLE_PROTOBUF_PLATFORM_MACROS_H_