diff options
| -rwxr-xr-x | build_detect_platform | 4 | ||||
| -rw-r--r-- | port/atomic_pointer.h | 4 | ||||
| -rw-r--r-- | port/port_posix.h | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/build_detect_platform b/build_detect_platform index d2a20ce..85d3594 100755 --- a/build_detect_platform +++ b/build_detect_platform @@ -82,7 +82,7 @@ case "$TARGET_OS" in ;; Darwin) PLATFORM=OS_MACOSX - COMMON_FLAGS="$MEMCMP_FLAG -DOS_MACOSX" + COMMON_FLAGS="$MEMCMP_FLAG" PLATFORM_SHARED_EXT=dylib [ -z "$INSTALL_PATH" ] && INSTALL_PATH=`pwd` PLATFORM_SHARED_LDFLAGS="-dynamiclib -install_name $INSTALL_PATH/" @@ -150,7 +150,7 @@ case "$TARGET_OS" in ;; IOS) PLATFORM=IOS - COMMON_FLAGS="$MEMCMP_FLAG -DOS_MACOSX" + COMMON_FLAGS="$MEMCMP_FLAG" [ -z "$INSTALL_PATH" ] && INSTALL_PATH=`pwd` PORT_FILE=port/port_posix.cc PORT_SSE_FILE=port/port_posix_sse.cc diff --git a/port/atomic_pointer.h b/port/atomic_pointer.h index 1c4c7aa..54f0885 100644 --- a/port/atomic_pointer.h +++ b/port/atomic_pointer.h @@ -25,7 +25,7 @@ #ifdef OS_WIN #include <windows.h> #endif -#ifdef OS_MACOSX +#ifdef __APPLE__ #include <libkern/OSAtomic.h> #endif @@ -54,7 +54,7 @@ namespace port { #define LEVELDB_HAVE_MEMORY_BARRIER // Mac OS -#elif defined(OS_MACOSX) +#elif defined(__APPLE__) inline void MemoryBarrier() { OSMemoryBarrier(); } diff --git a/port/port_posix.h b/port/port_posix.h index d67ab68..2491551 100644 --- a/port/port_posix.h +++ b/port/port_posix.h @@ -8,7 +8,7 @@ #define STORAGE_LEVELDB_PORT_PORT_POSIX_H_ #undef PLATFORM_IS_LITTLE_ENDIAN -#if defined(OS_MACOSX) +#if defined(__APPLE__) #include <machine/endian.h> #if defined(__DARWIN_LITTLE_ENDIAN) && defined(__DARWIN_BYTE_ORDER) #define PLATFORM_IS_LITTLE_ENDIAN \ @@ -50,7 +50,7 @@ #define PLATFORM_IS_LITTLE_ENDIAN (__BYTE_ORDER == __LITTLE_ENDIAN) #endif -#if defined(OS_MACOSX) || defined(OS_SOLARIS) || defined(OS_FREEBSD) ||\ +#if defined(__APPLE__) || defined(OS_SOLARIS) || defined(OS_FREEBSD) ||\ defined(OS_NETBSD) || defined(OS_OPENBSD) || defined(OS_DRAGONFLYBSD) ||\ defined(OS_ANDROID) || defined(OS_HPUX) || defined(CYGWIN) // Use fread/fwrite/fflush on platforms without _unlocked variants @@ -59,7 +59,7 @@ #define fflush_unlocked fflush #endif -#if defined(OS_MACOSX) || defined(OS_FREEBSD) ||\ +#if defined(__APPLE__) || defined(OS_FREEBSD) ||\ defined(OS_OPENBSD) || defined(OS_DRAGONFLYBSD) // Use fsync() on platforms without fdatasync() #define fdatasync fsync |