Fix Android recognition

The official macro is __ANDROID__; ANDROID may or may not be defined.
This commit is contained in:
hyc 2017-04-12 23:55:29 +01:00
parent e65d66fe04
commit 6c72d6a058

View File

@ -137,7 +137,7 @@ typedef SSIZE_T ssize_t;
#include <unistd.h>
#endif
#if defined(__sun) || defined(ANDROID)
#if defined(__sun) || defined(__ANDROID__)
/* Most platforms have posix_memalign, older may only have memalign */
#define HAVE_MEMALIGN 1
#include <malloc.h>
@ -153,7 +153,7 @@ typedef SSIZE_T ssize_t;
# define MDB_USE_SYSV_SEM 1
# endif
# define MDB_FDATASYNC fsync
#elif defined(ANDROID)
#elif defined(__ANDROID__)
# define MDB_FDATASYNC fsync
#endif
@ -298,7 +298,7 @@ union semun {
*/
#ifndef MDB_USE_ROBUST
/* Android currently lacks Robust Mutex support. So does glibc < 2.4. */
# if defined(MDB_USE_POSIX_MUTEX) && (defined(ANDROID) || \
# if defined(MDB_USE_POSIX_MUTEX) && (defined(__ANDROID__) || \
(defined(__GLIBC__) && GLIBC_VER < 0x020004))
# define MDB_USE_ROBUST 0
# else