diff options
| author | scrubbed <scrubbed@scrubbed> | 2017-07-24 10:54:00 -0700 |
|---|---|---|
| committer | Victor Costan <pwnall@chromium.org> | 2017-08-24 15:00:45 -0700 |
| commit | 0b402e96a76b19cd98e82402de636449a2613228 (patch) | |
| tree | 245f44f7f70646a40154c56f656a7e3765f2a332 /port | |
| parent | 8415f00eeedd96934d3578572d3802900e61a556 (diff) | |
| download | leveldb-0b402e96a76b19cd98e82402de636449a2613228.tar.gz | |
Use __APPLE__ instead of OS_MACOS. The former is compiler-provided.
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
Diffstat (limited to 'port')
| -rw-r--r-- | port/atomic_pointer.h | 4 | ||||
| -rw-r--r-- | port/port_posix.h | 6 |
2 files changed, 5 insertions, 5 deletions
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 |