projects
/
folly.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
116f13d
)
Exclude based on __APPLE__
author
Michael Lee
<mzlee@fb.com>
Fri, 29 Jan 2016 15:23:19 +0000
(07:23 -0800)
committer
facebook-github-bot-4
<folly-bot@fb.com>
Fri, 29 Jan 2016 16:20:24 +0000
(08:20 -0800)
Summary: This was showing up on a Linux compile to my sadness.
Reviewed By: francis-ma
Differential Revision:
D2876010
fb-gh-sync-id:
f638d593712c0aeb50177d96aaacb26575820359
folly/Portability.h
patch
|
blob
|
history
diff --git
a/folly/Portability.h
b/folly/Portability.h
index 0e9c471b1f13ff1bf7fc55f03cbcafb743df80fe..41c598208c446eb80d3b233c7e8f64972fec4d6b 100644
(file)
--- a/
folly/Portability.h
+++ b/
folly/Portability.h
@@
-231,7
+231,7
@@
namespace std { typedef ::max_align_t max_align_t; }
# error cannot define platform specific thread local storage
#endif
-#if
TARGET_IPHONE_SIMULATOR || TARGET_OS_IPHONE
+#if
defined(__APPLE__) && (TARGET_IPHONE_SIMULATOR || TARGET_OS_IPHONE)
#undef FOLLY_TLS
#endif