From: Hallvard Furuseth Date: Sun, 21 Aug 2016 21:22:18 +0000 (+0200) Subject: Clean up MDB_USE_ROBUST #defines X-Git-Tag: LMDB_0.9.19~22 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=38564c92dac6420ec20ec3d8d94a3c6f7f2bff54;p=openldap Clean up MDB_USE_ROBUST #defines Make explicit and default nonzero equivalent. Parenthesize. --- diff --git a/libraries/liblmdb/mdb.c b/libraries/liblmdb/mdb.c index fca90c9eff..246c32eb2f 100644 --- a/libraries/liblmdb/mdb.c +++ b/libraries/liblmdb/mdb.c @@ -258,6 +258,10 @@ typedef SSIZE_T ssize_t; # define MDB_USE_ROBUST 0 # else # define MDB_USE_ROBUST 1 +# endif +#endif /* !MDB_USE_ROBUST */ + +#if defined(MDB_USE_POSIX_MUTEX) && (MDB_USE_ROBUST) /* glibc < 2.12 only provided _np API */ # if (defined(__GLIBC__) && GLIBC_VER < 0x02000c) || \ (defined(PTHREAD_MUTEX_ROBUST_NP) && !defined(PTHREAD_MUTEX_ROBUST)) @@ -265,10 +269,9 @@ typedef SSIZE_T ssize_t; # define pthread_mutexattr_setrobust(attr, flag) pthread_mutexattr_setrobust_np(attr, flag) # define pthread_mutex_consistent(mutex) pthread_mutex_consistent_np(mutex) # endif -# endif -#endif /* MDB_USE_ROBUST */ +#endif /* MDB_USE_POSIX_MUTEX && MDB_USE_ROBUST */ -#if defined(MDB_OWNERDEAD) && MDB_USE_ROBUST +#if defined(MDB_OWNERDEAD) && (MDB_USE_ROBUST) #define MDB_ROBUST_SUPPORTED 1 #endif