]> Savannah Git Hosting - gnulib.git/commitdiff
lock tests: Fix build failure on GNU/Hurd (regression from 2017-01-05).
authorBruno Haible <bruno@clisp.org>
Tue, 21 Feb 2017 16:07:27 +0000 (17:07 +0100)
committerBruno Haible <bruno@clisp.org>
Tue, 21 Feb 2017 16:09:17 +0000 (17:09 +0100)
Reported by Rene Saavedra <rennes@openmailbox.org> 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.

ChangeLog
lib/glthread/lock.c
lib/glthread/lock.h

index e5dd80d663dc92adfec72b06e3da30d508304911..c36d0deaa1ac26b08b09b34b5561f26016ebaf25 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2017-02-21  Bruno Haible  <bruno@clisp.org>
+
+       lock tests: Fix build failure on GNU/Hurd (regression from 2017-01-05).
+       Reported by Rene Saavedra <rennes@openmailbox.org> 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  <bruno@clisp.org>
 
        lock tests: Fix build failure on z/OS.
index 061562b1eb8038ad900e4c6b30942a59f102d2b4..afc86f4d04bcb02e71763e410666d5edc1fe949c 100644 (file)
@@ -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
 
index ec16d39a2243f01134892d4f5933ea82d1eb8f6c..67932aaeb8e8c79d7c675383f81be1329c3890e0 100644 (file)
@@ -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