From: Bruno Haible Date: Tue, 3 Dec 2019 02:49:30 +0000 (+0100) Subject: Fix some more link errors with --enable-threads=isoc. X-Git-Tag: v1.0~4559 X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=9b2dcfaf45493f1527ea8d01f7634407de750978;p=gnulib.git Fix some more link errors with --enable-threads=isoc. * modules/pthread-mutex (Depends-on): Test $gl_threads_api differently. * modules/pthread-rwlock (Depends-on): Likewise. --- diff --git a/ChangeLog b/ChangeLog index 159f32c3b5..7fc89a62d1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2019-12-02 Bruno Haible + + Fix some more link errors with --enable-threads=isoc. + * modules/pthread-mutex (Depends-on): Test $gl_threads_api differently. + * modules/pthread-rwlock (Depends-on): Likewise. + 2019-12-02 Bruno Haible Fix link errors with --enable-threads=posix on AIX. diff --git a/modules/pthread-mutex b/modules/pthread-mutex index 556ffa8f23..9fdd2fecbf 100644 --- a/modules/pthread-mutex +++ b/modules/pthread-mutex @@ -7,7 +7,7 @@ m4/pthread-mutex.m4 Depends-on: pthread-h -pthread_mutex_timedlock [test $gl_threads_api = posix] +pthread_mutex_timedlock [test $gl_threads_api != windows] windows-timedmutex [test $gl_threads_api = windows] windows-timedrecmutex [test $gl_threads_api = windows] diff --git a/modules/pthread-rwlock b/modules/pthread-rwlock index e9354149aa..4944edd81f 100644 --- a/modules/pthread-rwlock +++ b/modules/pthread-rwlock @@ -7,8 +7,8 @@ m4/pthread-rwlock.m4 Depends-on: pthread-h -pthread-cond [test $gl_threads_api = posix && test $REPLACE_PTHREAD_RWLOCK_INIT = 1] -nanosleep [test $gl_threads_api = posix && test $HAVE_PTHREAD_RWLOCK_INIT = 1 && test $HAVE_PTHREAD_RWLOCK_TIMEDRDLOCK = 0] +pthread-cond [test $gl_threads_api != windows && test $REPLACE_PTHREAD_RWLOCK_INIT = 1] +nanosleep [test $gl_threads_api != windows && test $HAVE_PTHREAD_RWLOCK_INIT = 1 && test $HAVE_PTHREAD_RWLOCK_TIMEDRDLOCK = 0] windows-timedrwlock [test $gl_threads_api = windows] configure.ac: