summaryrefslogtreecommitdiff
path: root/lib/glthread
diff options
context:
space:
mode:
authorBruno Haible <bruno@clisp.org>2017-02-21 17:07:27 +0100
committerBruno Haible <bruno@clisp.org>2017-02-21 17:09:17 +0100
commit4084b3a1094372b960ce4a97634e08f4538c8bdd (patch)
treeb1c5fb6401be021beb654d7c16a6297aee9bd924 /lib/glthread
parent6361efe6e2c3c3a2cd63ce91563ee02b792beddd (diff)
downloadgnulib-4084b3a1094372b960ce4a97634e08f4538c8bdd.tar.gz
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.
Diffstat (limited to 'lib/glthread')
-rw-r--r--lib/glthread/lock.c2
-rw-r--r--lib/glthread/lock.h2
2 files changed, 2 insertions, 2 deletions
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