summaryrefslogtreecommitdiffstats
path: root/libcxxabi/src
diff options
context:
space:
mode:
authorHoward Hinnant <hhinnant@apple.com>2012-03-14 19:39:50 +0000
committerHoward Hinnant <hhinnant@apple.com>2012-03-14 19:39:50 +0000
commitffa26667d9b1c193eb8480b13b6513529333e369 (patch)
treec1080d4411dd283111b66669830c3d72e3af82fd /libcxxabi/src
parentbaae2be6243856b0c58b5154c1f99e1560db47db (diff)
downloadbcm5719-llvm-ffa26667d9b1c193eb8480b13b6513529333e369.tar.gz
bcm5719-llvm-ffa26667d9b1c193eb8480b13b6513529333e369.zip
Missed an underscore on the last commit.
llvm-svn: 152736
Diffstat (limited to 'libcxxabi/src')
-rw-r--r--libcxxabi/src/cxa_guard.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/libcxxabi/src/cxa_guard.cpp b/libcxxabi/src/cxa_guard.cpp
index a8d5bae8166..e403b64abd5 100644
--- a/libcxxabi/src/cxa_guard.cpp
+++ b/libcxxabi/src/cxa_guard.cpp
@@ -62,7 +62,7 @@ void set_initialized(guard_type* guard_object) {
pthread_mutex_t guard_mut = PTHREAD_MUTEX_INITIALIZER;
pthread_cond_t guard_cv = PTHREAD_COND_INITIALIZER;
-#if defined(__APPLE__) && !defined(__arm_)
+#if defined(__APPLE__) && !defined(__arm__)
typedef uint32_t lock_type;
@@ -169,7 +169,7 @@ int __cxa_guard_acquire(guard_type* guard_object)
int result = *initialized == 0;
if (result)
{
-#if defined(__APPLE__) && !defined(__arm_)
+#if defined(__APPLE__) && !defined(__arm__)
const lock_type id = pthread_mach_thread_np(pthread_self());
lock_type lock = get_lock(*guard_object);
if (lock)
OpenPOWER on IntegriCloud