Use MDB_USE_ROBUST not MDB_NO_ROBUST

diff --git a/libraries/liblmdb/Makefile b/libraries/liblmdb/Makefile
index e8e55e66fbd85dda4c4cd62cd9aa007579da510e..2c3817f04907be5c6ab837a57ea13669b4e4ab76 100644 (file)
--- 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 80b914b2344940cd0cd0531a2c568e3dee544aaf..1e5c0006d7e56212e773cec0e33831d53482b17c 100644 (file)
--- a/libraries/liblmdb/mdb.c
+++ b/libraries/liblmdb/mdb.c
@@ -252,25 +252,25 @@ union semun {
 #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