fix the manual config and flipped condition in SpinLock.h
authorRanjeeth Dasineni <ranjeeth@fb.com>
Thu, 15 Jan 2015 01:06:40 +0000 (17:06 -0800)
committerwoo <woo@fb.com>
Mon, 2 Feb 2015 21:10:45 +0000 (13:10 -0800)
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

index 2e2356c938e76f9fb45ab50f06ea8618a4586e45..3b5aa44f1f5117b1f57a0fc99587dd8d4c2a3d24 100644 (file)
@@ -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 <typename LOCK>