Merge pull request #1261 from gjasny/disable-tls-for-osx-10.6
Disable thread local storage for OSX < 10.7
This commit is contained in:
commit
85ba13c9bf
@ -99,6 +99,7 @@ GOOGLE_PROTOBUF_PLATFORM_ERROR
|
||||
|
||||
#if defined(__APPLE__)
|
||||
#define GOOGLE_PROTOBUF_OS_APPLE
|
||||
#include <Availability.h>
|
||||
#include <TargetConditionals.h>
|
||||
#if TARGET_OS_IPHONE
|
||||
#define GOOGLE_PROTOBUF_OS_IPHONE
|
||||
@ -125,4 +126,9 @@ GOOGLE_PROTOBUF_PLATFORM_ERROR
|
||||
#define GOOGLE_PROTOBUF_NO_THREADLOCAL
|
||||
#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_
|
||||
|
Loading…
Reference in New Issue
Block a user