Optimize perf of EventBase with new option.

[folly.git] / folly / Portability.h

diff --git a/folly/Portability.h b/folly/Portability.h
index 6ce3d51dfb67c7def26d835e1e928267003d6d8c..87dbe2569314fc239f4ed779c1fd56d66e12d15f 100644 (file)
--- a/folly/Portability.h
+++ b/folly/Portability.h
@@ -18,7 +18,7 @@
 #define FOLLY_PORTABILITY_H_
 
 #ifndef FOLLY_NO_CONFIG
-#include "folly-config.h"
+#include <folly/folly-config.h>
 #endif
 
 #ifdef FOLLY_PLATFORM_CONFIG
@@ -29,7 +29,7 @@
 #include <features.h>
 #endif
 
-#include "CPortability.h"
+#include <folly/CPortability.h>
 
 #if FOLLY_HAVE_SCHED_H
  #include <sched.h>
@@ -64,6 +64,7 @@ struct MaxAlign { char c; } __attribute__((__aligned__));
 # ifdef _USE_ATTRIBUTES_FOR_SAL
 #    undef _USE_ATTRIBUTES_FOR_SAL
 # endif
+/* nolint */
 # define _USE_ATTRIBUTES_FOR_SAL 1
 # include <sal.h>
 # define FOLLY_PRINTF_FORMAT _Printf_format_string_
@@ -126,9 +127,11 @@ struct MaxAlign { char c; } __attribute__((__aligned__));
 // portable version check
 #ifndef __GNUC_PREREQ
 # if defined __GNUC__ && defined __GNUC_MINOR__
+/* nolint */
 #  define __GNUC_PREREQ(maj, min) ((__GNUC__ << 16) + __GNUC_MINOR__ >= \
                                    ((maj) << 16) + (min))
 # else
+/* nolint */
 #  define __GNUC_PREREQ(maj, min) 0
 # endif
 #endif
@@ -149,7 +152,8 @@ struct MaxAlign { char c; } __attribute__((__aligned__));
 /* Platform specific TLS support
  * gcc implements __thread
  * msvc implements __declspec(thread)
- * the semantics are the same (but remember __thread is broken on apple)
+ * the semantics are the same
+ * (but remember __thread has different semantics when using emutls (ex. apple))
  */
 #if defined(_MSC_VER)
 # define FOLLY_TLS __declspec(thread)
@@ -235,6 +239,7 @@ typedef SSIZE_T ssize_t;
 # define strerror_r(errno,buf,len) strerror_s(buf,len,errno)
 
 // compiler specific to compiler specific
+// nolint
 # define __PRETTY_FUNCTION__ __FUNCSIG__
 #endif
 
@@ -245,4 +250,9 @@ using namespace FOLLY_GFLAGS_NAMESPACE;
 }  // namespace gflags
 #endif
 
+// for TARGET_OS_IPHONE
+#ifdef __APPLE__
+#include <TargetConditionals.h>
+#endif
+
 #endif // FOLLY_PORTABILITY_H_