From: Andrew Krieger <andrew.krieger@oculus.com>
Date: Tue, 29 Aug 2017 05:36:16 +0000 (-0700)
Subject: Allow forcing value for FOLLY_FUTURE_USING_FIBER in folly-config.h
X-Git-Tag: v2017.09.04.00~13
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=ecba6a15740be358f327e3dbba8dfb1eb73ce66c;p=folly.git

Allow forcing value for FOLLY_FUTURE_USING_FIBER in folly-config.h

Summary:
Let clients choose whether to use fibers or not, but default
to the same autodetected setting as prior logic.

Reviewed By: yfeldblum

Differential Revision: D5585605

fbshipit-source-id: 9a4bf9f9bc23b4e15601f30c40602f21798c9685
---

diff --git a/folly/futures/Future-inl.h b/folly/futures/Future-inl.h
index 6ba9b241..e682dcab 100644
--- a/folly/futures/Future-inl.h
+++ b/folly/futures/Future-inl.h
@@ -28,12 +28,14 @@
 #include <folly/futures/Timekeeper.h>
 #include <folly/futures/detail/Core.h>
 
+#ifndef FOLLY_FUTURE_USING_FIBER
 #if FOLLY_MOBILE || defined(__APPLE__)
 #define FOLLY_FUTURE_USING_FIBER 0
 #else
 #define FOLLY_FUTURE_USING_FIBER 1
 #include <folly/fibers/Baton.h>
 #endif
+#endif
 
 namespace folly {