From: Ranjeeth Dasineni <ranjeeth@fb.com>
Date: Thu, 15 Jan 2015 01:06:40 +0000 (-0800)
Subject: fix the manual config and flipped condition in SpinLock.h
X-Git-Tag: v0.23.0~47
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=e300e8b640a048f128c9a60a8df101b30a57256a;p=folly.git

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
---

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 <typename LOCK>