Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(222)

Unified Diff: base/atomicops.h

Issue 10696193: Have iOS use the same atomicops_internal implementation that Mac uses. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Fix #include guard without typo. Created 8 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | base/atomicops_internals_mac.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/atomicops.h
diff --git a/base/atomicops.h b/base/atomicops.h
index a88fdff93541fe99065fbe9ba47f389bd2626f21..675132c46f0de36e02e70fd2deb81af50f616371 100644
--- a/base/atomicops.h
+++ b/base/atomicops.h
@@ -130,8 +130,8 @@ Atomic64 Release_Load(volatile const Atomic64* ptr);
// Include our platform specific implementation.
#if defined(OS_WIN) && defined(COMPILER_MSVC) && defined(ARCH_CPU_X86_FAMILY)
#include "base/atomicops_internals_x86_msvc.h"
-#elif defined(OS_MACOSX) && defined(ARCH_CPU_X86_FAMILY)
-#include "base/atomicops_internals_x86_macosx.h"
+#elif defined(OS_MACOSX)
+#include "base/atomicops_internals_mac.h"
#elif defined(COMPILER_GCC) && defined(ARCH_CPU_X86_FAMILY)
#include "base/atomicops_internals_x86_gcc.h"
#elif defined(COMPILER_GCC) && defined(ARCH_CPU_ARM_FAMILY)
« no previous file with comments | « no previous file | base/atomicops_internals_mac.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698