From: Bruno Haible Date: Tue, 21 Feb 2017 16:07:27 +0000 (+0100) Subject: lock tests: Fix build failure on GNU/Hurd (regression from 2017-01-05). X-Git-Tag: v1.0~6351 X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=4084b3a1094372b960ce4a97634e08f4538c8bdd;p=gnulib.git lock tests: Fix build failure on GNU/Hurd (regression from 2017-01-05). Reported by Rene Saavedra in https://debbugs.gnu.org/cgi/bugreport.cgi?bug=25821 via Paul Eggert. * lib/glthread/lock.h: On glibc systems without PTHREAD_RWLOCK_WRITER_NONRECURSIVE_INITIALIZER_NP, use the fallback implementation of rwlocks. * lib/glthread/lock.c: Likewise. --- diff --git a/ChangeLog b/ChangeLog index e5dd80d663..c36d0deaa1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2017-02-21 Bruno Haible + + lock tests: Fix build failure on GNU/Hurd (regression from 2017-01-05). + Reported by Rene Saavedra in + https://debbugs.gnu.org/cgi/bugreport.cgi?bug=25821 via Paul Eggert. + * lib/glthread/lock.h: On glibc systems without + PTHREAD_RWLOCK_WRITER_NONRECURSIVE_INITIALIZER_NP, use the fallback + implementation of rwlocks. + * lib/glthread/lock.c: Likewise. + 2017-02-20 Bruno Haible lock tests: Fix build failure on z/OS. diff --git a/lib/glthread/lock.c b/lib/glthread/lock.c index 061562b1eb..afc86f4d04 100644 --- a/lib/glthread/lock.c +++ b/lib/glthread/lock.c @@ -30,7 +30,7 @@ /* ------------------------- gl_rwlock_t datatype ------------------------- */ -# if HAVE_PTHREAD_RWLOCK && (HAVE_PTHREAD_RWLOCK_RDLOCK_PREFER_WRITER || (__GNU_LIBRARY__ > 1)) +# if HAVE_PTHREAD_RWLOCK && (HAVE_PTHREAD_RWLOCK_RDLOCK_PREFER_WRITER || (defined PTHREAD_RWLOCK_WRITER_NONRECURSIVE_INITIALIZER_NP && (__GNU_LIBRARY__ > 1))) # ifdef PTHREAD_RWLOCK_INITIALIZER diff --git a/lib/glthread/lock.h b/lib/glthread/lock.h index ec16d39a22..67932aaeb8 100644 --- a/lib/glthread/lock.h +++ b/lib/glthread/lock.h @@ -179,7 +179,7 @@ typedef pthread_mutex_t gl_lock_t; /* ------------------------- gl_rwlock_t datatype ------------------------- */ -# if HAVE_PTHREAD_RWLOCK && (HAVE_PTHREAD_RWLOCK_RDLOCK_PREFER_WRITER || (__GNU_LIBRARY__ > 1)) +# if HAVE_PTHREAD_RWLOCK && (HAVE_PTHREAD_RWLOCK_RDLOCK_PREFER_WRITER || (defined PTHREAD_RWLOCK_WRITER_NONRECURSIVE_INITIALIZER_NP && (__GNU_LIBRARY__ > 1))) # ifdef PTHREAD_RWLOCK_INITIALIZER