github-repos/leveldb
1
0
Fork 0
mirror of https://github.com/google/leveldb.git synced 2026-08-22 10:53:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use __APPLE__ instead of OS_MACOS. The former is compiler-provided.

Browse Source 
Use __APPLE__ instead of OS_MACOS when testing for the Apple platform and
remove the latter symbol from the BUILD file. This fixes incompatibility issues
when using the library on an Apple device.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=162958094
This commit is contained in:
scrubbed
2017-07-24 10:54:00 -07:00
committed by Victor Costan
parent 8415f00eee
commit 0b402e96a7
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
build_detect_platform
View File

@@ -82,7 +82,7 @@ case "$TARGET_OS" in
;; ;;
Darwin) Darwin)
PLATFORM=OS_MACOSX PLATFORM=OS_MACOSX
COMMON_FLAGS="$MEMCMP_FLAG -DOS_MACOSX" COMMON_FLAGS="$MEMCMP_FLAG"
PLATFORM_SHARED_EXT=dylib PLATFORM_SHARED_EXT=dylib
[ -z "$INSTALL_PATH" ] && INSTALL_PATH=`pwd` [ -z "$INSTALL_PATH" ] && INSTALL_PATH=`pwd`
PLATFORM_SHARED_LDFLAGS="-dynamiclib -install_name $INSTALL_PATH/" PLATFORM_SHARED_LDFLAGS="-dynamiclib -install_name $INSTALL_PATH/"
@@ -150,7 +150,7 @@ case "$TARGET_OS" in
;; ;;
IOS) IOS)
PLATFORM=IOS PLATFORM=IOS
COMMON_FLAGS="$MEMCMP_FLAG -DOS_MACOSX" COMMON_FLAGS="$MEMCMP_FLAG"
[ -z "$INSTALL_PATH" ] && INSTALL_PATH=`pwd` [ -z "$INSTALL_PATH" ] && INSTALL_PATH=`pwd`
PORT_FILE=port/port_posix.cc PORT_FILE=port/port_posix.cc
PORT_SSE_FILE=port/port_posix_sse.cc PORT_SSE_FILE=port/port_posix_sse.cc

4
port/atomic_pointer.h
View File

@@ -25,7 +25,7 @@
#ifdef OS_WIN #ifdef OS_WIN
#include <windows.h> #include <windows.h>
#endif #endif
#ifdef OS_MACOSX #ifdef __APPLE__
#include <libkern/OSAtomic.h> #include <libkern/OSAtomic.h>
#endif #endif
@@ -54,7 +54,7 @@ namespace port {
#define LEVELDB_HAVE_MEMORY_BARRIER #define LEVELDB_HAVE_MEMORY_BARRIER
// Mac OS // Mac OS
#elif defined(OS_MACOSX) #elif defined(__APPLE__)
inline void MemoryBarrier() { inline void MemoryBarrier() {
OSMemoryBarrier(); OSMemoryBarrier();
} }

6
port/port_posix.h
View File

@@ -8,7 +8,7 @@
#define STORAGE_LEVELDB_PORT_PORT_POSIX_H_ #define STORAGE_LEVELDB_PORT_PORT_POSIX_H_
#undef PLATFORM_IS_LITTLE_ENDIAN #undef PLATFORM_IS_LITTLE_ENDIAN
#if defined(OS_MACOSX) #if defined(__APPLE__)
#include <machine/endian.h> #include <machine/endian.h>
#if defined(__DARWIN_LITTLE_ENDIAN) && defined(__DARWIN_BYTE_ORDER) #if defined(__DARWIN_LITTLE_ENDIAN) && defined(__DARWIN_BYTE_ORDER)
#define PLATFORM_IS_LITTLE_ENDIAN \ #define PLATFORM_IS_LITTLE_ENDIAN \
@@ -50,7 +50,7 @@
#define PLATFORM_IS_LITTLE_ENDIAN (__BYTE_ORDER == __LITTLE_ENDIAN) #define PLATFORM_IS_LITTLE_ENDIAN (__BYTE_ORDER == __LITTLE_ENDIAN)
#endif #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_NETBSD) || defined(OS_OPENBSD) || defined(OS_DRAGONFLYBSD) ||\
defined(OS_ANDROID) || defined(OS_HPUX) || defined(CYGWIN) defined(OS_ANDROID) || defined(OS_HPUX) || defined(CYGWIN)
// Use fread/fwrite/fflush on platforms without _unlocked variants // Use fread/fwrite/fflush on platforms without _unlocked variants
@@ -59,7 +59,7 @@
#define fflush_unlocked fflush #define fflush_unlocked fflush
#endif #endif
#if defined(OS_MACOSX) || defined(OS_FREEBSD) ||\ #if defined(__APPLE__) || defined(OS_FREEBSD) ||\
defined(OS_OPENBSD) || defined(OS_DRAGONFLYBSD) defined(OS_OPENBSD) || defined(OS_DRAGONFLYBSD)
// Use fsync() on platforms without fdatasync() // Use fsync() on platforms without fdatasync()
#define fdatasync fsync #define fdatasync fsync