From: Howard Chu <hyc@openldap.org>
Date: Sat, 31 Oct 2015 02:27:31 +0000 (+0000)
Subject: Use MDB_USE_ROBUST not MDB_NO_ROBUST
X-Git-Tag: LMDB_0.9.17~55
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=caca4d8be6f5f0f3e878b63cf1ab7caa702aff2e;p=openldap

Use MDB_USE_ROBUST not MDB_NO_ROBUST
---

diff --git a/libraries/liblmdb/Makefile b/libraries/liblmdb/Makefile
index afd0cd8cc8..79752d2995 100644
--- a/libraries/liblmdb/Makefile
+++ b/libraries/liblmdb/Makefile
@@ -13,7 +13,7 @@
 # - MDB_FDATASYNC
 # - MDB_FDATASYNC_WORKS
 # - MDB_USE_PWRITEV
-# - MDB_NO_ROBUST
+# - MDB_USE_ROBUST
 #
 # There may be other macros in mdb.c of interest. You should
 # read mdb.c before changing any of them.
diff --git a/libraries/liblmdb/mdb.c b/libraries/liblmdb/mdb.c
index ac3ec2b640..86ceb0bf8e 100644
--- a/libraries/liblmdb/mdb.c
+++ b/libraries/liblmdb/mdb.c
@@ -238,25 +238,25 @@ typedef SSIZE_T	ssize_t;
 #define MDB_OWNERDEAD	EOWNERDEAD	/**< #LOCK_MUTEX0() result if dead owner */
 #endif
 
-/* Android currently lacks Robust Mutex support */
-#if defined(ANDROID) && defined(MDB_USE_POSIX_MUTEX)
-#define MDB_NO_ROBUST	1
-#endif
 
 /** Some platforms define the EOWNERDEAD error code
  * even though they don't support Robust Mutexes.
- * Compile with -DMDB_NO_ROBUST, or use some other
+ * Compile with -DMDB_USE_ROBUST=0, or use some other
  * mechanism like -DMDB_USE_SYSV_SEM instead of
  * -DMDB_USE_POSIX_MUTEX. (SysV semaphores are
  * also Robust, but some systems don't support them
  * either.)
  */
-
-#ifndef MDB_NO_ROBUST
-#define MDB_NO_ROBUST	0
+#ifndef MDB_USE_ROBUST
+/* Android currently lacks Robust Mutex support */
+#if defined(ANDROID) && defined(MDB_USE_POSIX_MUTEX) && !defined(MDB_USE_ROBUST)
+#define MDB_USE_ROBUST	0
+#else
+#define MDB_USE_ROBUST	1
 #endif
+#endif /* MDB_USE_ROBUST */
 
-#if defined(MDB_OWNERDEAD) && !(MDB_NO_ROBUST)
+#if defined(MDB_OWNERDEAD) && MDB_USE_ROBUST
 #define MDB_ROBUST_SUPPORTED	1
 #endif