From e300e8b640a048f128c9a60a8df101b30a57256a Mon Sep 17 00:00:00 2001 From: Ranjeeth Dasineni Date: Wed, 14 Jan 2015 17:06:40 -0800 Subject: [PATCH] fix the manual config and flipped condition in SpinLock.h Summary: i) FOLLY_HAVE_INT128_T definition is duplicated and is getting set to 1 on android. deleted that. ii) we dont have pthread_spinlock_t and pthread_atfork on android, the former is absent apple as well iii) a condition got flipped in D1768669. __ANDROID__ implies !FOLLY_HAVE_PTHREAD_SPINLOCK_T. fixed that Test Plan: - fbconfig -r folly && fbmake - ran folly build with buck as well - synced to fb4a and it builds Reviewed By: seanc@fb.com Subscribers: doug, seanc, folly-diffs@ FB internal diff: D1783579 Signature: t1:1783579:1421350138:9301303f77784e7bdb851e3f643751078457b025 --- folly/SpinLock.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/folly/SpinLock.h b/folly/SpinLock.h index 2e2356c9..3b5aa44f 100644 --- a/folly/SpinLock.h +++ b/folly/SpinLock.h @@ -25,9 +25,9 @@ typedef SpinLockMslImpl SpinLock; #elif __APPLE__ typedef SpinLockAppleImpl SpinLock; #elif FOLLY_HAVE_PTHREAD_SPINLOCK_T -typedef SpinLockPthreadMutexImpl SpinLock; -#else typedef SpinLockPthreadImpl SpinLock; +#else +typedef SpinLockPthreadMutexImpl SpinLock; #endif template -- 2.34.1