Skip to content

Fix macOS 10.12 build warning #422

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Fix macOS 10.12 build warning #422

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
56a379a
Fix macOS 10.12 build warning
droark Nov 7, 2016
b485298
Merge branch 'master' into master
droark Dec 14, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions port/atomic_pointer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,10 @@
#include <windows.h>
#endif
#ifdef __APPLE__
#if defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101200
#include <libkern/OSAtomic.h>
#endif
#endif

#if defined(_M_X64) || defined(__x86_64__)
#define ARCH_CPU_X86_FAMILY 1
Expand Down Expand Up @@ -56,7 +58,11 @@ namespace port {
// Mac OS
#elif defined(__APPLE__)
inline void MemoryBarrier() {
#if defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101200
OSMemoryBarrier();
#else
atomic_thread_fence(std::memory_order_seq_cst);
#endif
}
#define LEVELDB_HAVE_MEMORY_BARRIER

Expand Down