]> git.sur5r.net Git - openldap/commitdiff
ITS#8330 Fix robust mutex detection for glibc 2.10 and 2.11
authorSebastien Launay <sebastien@slaunay.fr>
Thu, 3 Dec 2015 18:42:36 +0000 (10:42 -0800)
committerHoward Chu <hyc@openldap.org>
Thu, 3 Dec 2015 19:09:57 +0000 (19:09 +0000)
pthread_mutexattr_setrobust and pthread_mutex_consistent are provided since 2.12 not 2.10:
https://sourceware.org/git/?p=glibc.git;a=commit;h=402cd98775db1478f64c9b0dbe00664b89eb2773
https://sourceware.org/git/?p=glibc.git;a=commit;h=78ee21859939ff75ccf8bbe00499b0c462df2e2d

libraries/liblmdb/mdb.c

index 96c859efd9bdd98250bfd2ab633fe52ae394fa71..f495d6c1f82894fbf2686952a37481d6190e14f8 100644 (file)
@@ -256,8 +256,8 @@ typedef SSIZE_T     ssize_t;
 #  define MDB_USE_ROBUST       0
 # else
 #  define MDB_USE_ROBUST       1
-/* glibc < 2.10 only provided _np API */
-#  if defined(__GLIBC__) && GLIBC_VER < 0x02000a
+/* glibc < 2.12 only provided _np API */
+#  if defined(__GLIBC__) && GLIBC_VER < 0x02000c
 #   define PTHREAD_MUTEX_ROBUST        PTHREAD_MUTEX_ROBUST_NP
 #   define pthread_mutexattr_setrobust(attr, flag)     pthread_mutexattr_setrobust_np(attr, flag)
 #   define pthread_mutex_consistent(mutex)     pthread_mutex_consistent_np(mutex)