* lib/glthread/cond.h: Revert my 2026-03-31 namespace cleanup patch, which was incorrect because this header’s gl_cond_timedwait_func function uses lock_t even when threading is disabled. --- ChangeLog | 6 ++++++ lib/glthread/cond.h | 5 +---- 2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog index eac1bbe281..5ef5207cc6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2026-04-25 Paul Eggert <[email protected]> + cond: always include glthread/lock.h + * lib/glthread/cond.h: Revert my 2026-03-31 namespace cleanup + patch, which was incorrect because this header’s + gl_cond_timedwait_func function uses lock_t even when threading is + disabled. + thread: better nonreturn fix for gl_thread_create * lib/glthread/thread.c (gl_thread_create): Define as a function only if multithreading. diff --git a/lib/glthread/cond.h b/lib/glthread/cond.h index 3b5e0c1640..f2b8db9ccd 100644 --- a/lib/glthread/cond.h +++ b/lib/glthread/cond.h @@ -57,10 +57,7 @@ #include <stdlib.h> #include <time.h> -#if (USE_ISOC_THREADS || USE_POSIX_THREADS || USE_ISOC_AND_POSIX_THREADS \ - || USE_WINDOWS_THREADS) -# include "glthread/lock.h" -#endif +#include "glthread/lock.h" #if !defined c11_threads_in_use # if HAVE_THREADS_H && USE_POSIX_THREADS_FROM_LIBC -- 2.53.0
