Merge pull request #10743 from brad0/21_openbsd_platform_macros

21.x No longer define no_threadlocal on OpenBSD
2 years ago · 5d90ef2432
parent 0ee5525a75 a971d06fc2
commit 5d90ef2432
1 changed files with 2 additions and 2 deletions
--- a/src/google/protobuf/stubs/platform_macros.h
+++ b/src/google/protobuf/stubs/platform_macros.h
@ -122,11 +122,11 @@ GOOGLE_PROTOBUF_PLATFORM_ERROR

 #undef GOOGLE_PROTOBUF_PLATFORM_ERROR

-#if defined(GOOGLE_PROTOBUF_OS_ANDROID) || defined(GOOGLE_PROTOBUF_OS_IPHONE) || defined(__OpenBSD__)
+#if defined(GOOGLE_PROTOBUF_OS_ANDROID) || defined(GOOGLE_PROTOBUF_OS_IPHONE)
 // 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 and OpenBSD also do not support the __thread keyword.
+// iOS also does not support the __thread keyword.
 #define GOOGLE_PROTOBUF_NO_THREADLOCAL
 #endif