Commit 0a954f1a authored by Howard Chu's avatar Howard Chu
Browse files

Fix Android recognition

The official macro is __ANDROID__; ANDROID may or may not be defined.
parent aa77c832
...@@ -144,7 +144,7 @@ typedef SSIZE_T ssize_t; ...@@ -144,7 +144,7 @@ typedef SSIZE_T ssize_t;
#include <unistd.h> #include <unistd.h>
#endif #endif
#if defined(__sun) || defined(ANDROID) #if defined(__sun) || defined(__ANDROID__)
/* Most platforms have posix_memalign, older may only have memalign */ /* Most platforms have posix_memalign, older may only have memalign */
#define HAVE_MEMALIGN 1 #define HAVE_MEMALIGN 1
#include <malloc.h> #include <malloc.h>
...@@ -164,7 +164,7 @@ typedef SSIZE_T ssize_t; ...@@ -164,7 +164,7 @@ typedef SSIZE_T ssize_t;
# define MDB_USE_SYSV_SEM 1 # define MDB_USE_SYSV_SEM 1
# endif # endif
# define MDB_FDATASYNC fsync # define MDB_FDATASYNC fsync
#elif defined(ANDROID) #elif defined(__ANDROID__)
# define MDB_FDATASYNC fsync # define MDB_FDATASYNC fsync
#endif #endif
...@@ -310,7 +310,7 @@ union semun { ...@@ -310,7 +310,7 @@ union semun {
*/ */
#ifndef MDB_USE_ROBUST #ifndef MDB_USE_ROBUST
/* Android currently lacks Robust Mutex support. So does glibc < 2.4. */ /* 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)) (defined(__GLIBC__) && GLIBC_VER < 0x020004))
# define MDB_USE_ROBUST 0 # define MDB_USE_ROBUST 0
# else # else
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment