From edb11085302f80f38c9d976f003aa1c9002c7abb Mon Sep 17 00:00:00 2001
From: Dimitry Andric <dim@FreeBSD.org>
Date: Thu, 1 Jun 2017 20:59:10 +0000
Subject: Vendor import of libc++ trunk r304460:
 https://llvm.org/svn/llvm-project/libcxx/trunk@304460

---
 include/__string | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'include/__string')

diff --git a/include/__string b/include/__string
index 75608cea71d9..d30c7fddc8d6 100644
--- a/include/__string
+++ b/include/__string
@@ -57,14 +57,16 @@ template <> struct char_traits<wchar_t>;
 #include <cstdio>     // For EOF.
 #include <memory>     // for __murmur2_or_cityhash
 
-#include <__undef_min_max>
-
 #include <__debug>
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #pragma GCC system_header
 #endif
 
+_LIBCPP_PUSH_MACROS
+#include <__undef_macros>
+
+
 _LIBCPP_BEGIN_NAMESPACE_STD
 
 // char_traits
@@ -870,4 +872,6 @@ struct __quoted_output_proxy
 
 _LIBCPP_END_NAMESPACE_STD
 
+_LIBCPP_POP_MACROS
+
 #endif  // _LIBCPP___STRING
-- 
cgit v1.3