summaryrefslogtreecommitdiffstats
path: root/libcxx/include/mutex
diff options
context:
space:
mode:
authorHoward Hinnant <hhinnant@apple.com>2011-11-29 16:45:27 +0000
committerHoward Hinnant <hhinnant@apple.com>2011-11-29 16:45:27 +0000
commitab4f438239424dd39b83338ab0b4faa41245e506 (patch)
treea8b954bc4709873c1a36b50184a051f5e6330e9e /libcxx/include/mutex
parent7a81dea5168d9ff98c1c99e6a4c971823400a291 (diff)
downloadbcm5719-llvm-ab4f438239424dd39b83338ab0b4faa41245e506.tar.gz
bcm5719-llvm-ab4f438239424dd39b83338ab0b4faa41245e506.zip
Add protection from min/max macros
llvm-svn: 145407
Diffstat (limited to 'libcxx/include/mutex')
-rw-r--r--libcxx/include/mutex2
1 files changed, 2 insertions, 0 deletions
diff --git a/libcxx/include/mutex b/libcxx/include/mutex
index 37e74d6d575..d1d0a6e0587 100644
--- a/libcxx/include/mutex
+++ b/libcxx/include/mutex
@@ -179,6 +179,8 @@ template<class Callable, class ...Args>
#include <tuple>
#endif
+#include <__undef_min_max>
+
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
#pragma GCC system_header
#endif
OpenPOWER on IntegriCloud