From 7485061dd4022edb389503f0f8cc53421e49eb83 Mon Sep 17 00:00:00 2001 From: "deanm@google.com" Date: Wed, 6 Aug 2008 14:42:40 +0000 Subject: Fix incorrect OS_APPLE to OS_MACOSX and drop COMPILER_GCC since the code uses the Apple APIs for atomic operations and not inline assembly. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@432 0039d316-1c4b-4281-b951-d872f2087c98 --- base/atomicops.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'base/atomicops.h') diff --git a/base/atomicops.h b/base/atomicops.h index 1b3bc02..f1742f5 100644 --- a/base/atomicops.h +++ b/base/atomicops.h @@ -151,7 +151,7 @@ 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_APPLE) && defined(COMPILER_GCC) && defined(ARCH_CPU_X86_FAMILY) +#elif defined(OS_MACOSX) && defined(ARCH_CPU_X86_FAMILY) #include "base/atomicops_internals_x86_macosx.h" #elif defined(COMPILER_GCC) && defined(ARCH_CPU_X86_FAMILY) #include "base/atomicops_internals_x86_gcc.h" -- cgit v1.1