Skip to content

Commit 5d90ef2

Browse files
authored
Merge pull request #10743 from brad0/21_openbsd_platform_macros
21.x No longer define no_threadlocal on OpenBSD
2 parents 0ee5525 + a971d06 commit 5d90ef2

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

src/google/protobuf/stubs/platform_macros.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,11 +122,11 @@ GOOGLE_PROTOBUF_PLATFORM_ERROR
122122

123123
#undef GOOGLE_PROTOBUF_PLATFORM_ERROR
124124

125-
#if defined(GOOGLE_PROTOBUF_OS_ANDROID) || defined(GOOGLE_PROTOBUF_OS_IPHONE) || defined(__OpenBSD__)
125+
#if defined(GOOGLE_PROTOBUF_OS_ANDROID) || defined(GOOGLE_PROTOBUF_OS_IPHONE)
126126
// Android ndk does not support the __thread keyword very well yet. Here
127127
// we use pthread_key_create()/pthread_getspecific()/... methods for
128128
// TLS support on android.
129-
// iOS and OpenBSD also do not support the __thread keyword.
129+
// iOS also does not support the __thread keyword.
130130
#define GOOGLE_PROTOBUF_NO_THREADLOCAL
131131
#endif
132132

0 commit comments

Comments
 (0)