diff options
| author | Feng Xiao <xiaofeng@google.com> | 2016-10-26 16:53:14 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-26 16:53:14 -0700 |
| commit | e9d9e56a6bfa93be5b97d40fd70382807e526d2d (patch) | |
| tree | 27d49d14f8c656b6524888254f2d0c75cf161c5c | |
| parent | 734930f9197b7bc97c3c794c7a949fee2a08c280 (diff) | |
| parent | bfc1299a091abdd4b3e89889d405db9371fc8f77 (diff) | |
| download | protobuf-e9d9e56a6bfa93be5b97d40fd70382807e526d2d.tar.gz protobuf-e9d9e56a6bfa93be5b97d40fd70382807e526d2d.tar.bz2 protobuf-e9d9e56a6bfa93be5b97d40fd70382807e526d2d.zip | |
Merge pull request #2290 from ramrunner/OpenBSDsupport
define no_threadlocal on OpenBSD
| -rw-r--r-- | src/google/protobuf/stubs/platform_macros.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/google/protobuf/stubs/platform_macros.h b/src/google/protobuf/stubs/platform_macros.h index 4ba4b348..8b7f224f 100644 --- a/src/google/protobuf/stubs/platform_macros.h +++ b/src/google/protobuf/stubs/platform_macros.h @@ -114,11 +114,11 @@ GOOGLE_PROTOBUF_PLATFORM_ERROR #undef GOOGLE_PROTOBUF_PLATFORM_ERROR -#if defined(GOOGLE_PROTOBUF_OS_ANDROID) || defined(GOOGLE_PROTOBUF_OS_IPHONE) +#if defined(GOOGLE_PROTOBUF_OS_ANDROID) || defined(GOOGLE_PROTOBUF_OS_IPHONE) || defined(__OpenBSD__) // Android ndk does not support the __thread keyword very well yet. Here // we use pthread_key_create()/pthread_getspecific()/... methods for // TLS support on android. -// iOS also does not support the __thread keyword. +// iOS and OpenBSD also do not support the __thread keyword. #define GOOGLE_PROTOBUF_NO_THREADLOCAL #endif |