]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
gh-81057: Fix the wasm32-wasi Buildbot (gh-100139)
authorEric Snow <ericsnowcurrently@gmail.com>
Fri, 9 Dec 2022 17:17:54 +0000 (10:17 -0700)
committerGitHub <noreply@github.com>
Fri, 9 Dec 2022 17:17:54 +0000 (10:17 -0700)
The build was broken by gh-100084.

https://github.com/python/cpython/issues/81057

Include/internal/pycore_pythread.h
Python/thread_pthread.h

index 4aeb285b89a848e307ff3b85e94339fc1d9866ed..f53921494c158f336a54b27260f4672d805bb328 100644 (file)
@@ -33,7 +33,7 @@ extern "C" {
 # endif /* _POSIX_THREADS */
 #endif /* _POSIX_THREADS */
 
-#if defined(_POSIX_THREADS) && !defined(HAVE_PTHREAD_STUBS)
+#if defined(_POSIX_THREADS) || defined(HAVE_PTHREAD_STUBS)
 # define _USE_PTHREADS
 #endif
 
index ae312e987bd6ad85dd8de44fda64ad6bb9d3d00a..76d6f3bcdf9c4073718d9e7f0ae495ceaf911a75 100644 (file)
@@ -132,7 +132,8 @@ init_condattr(void)
     if (pthread_condattr_setclock(&ca, CLOCK_MONOTONIC) == 0) {
         condattr_monotonic = &ca;  // Use monotonic clock
     }
-#endif
+# undef ca
+#endif  // CONDATTR_MONOTONIC
 }
 
 int