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/valarray | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'include/valarray')

diff --git a/include/valarray b/include/valarray
index f8e19acdb7197..ee61238a932f3 100644
--- a/include/valarray
+++ b/include/valarray
@@ -347,12 +347,14 @@ template <class T> unspecified2 end(const valarray<T>& v);
 #include <functional>
 #include <new>
 
-#include <__undef_min_max>
-
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #pragma GCC system_header
 #endif
 
+_LIBCPP_PUSH_MACROS
+#include <__undef_macros>
+
+
 _LIBCPP_BEGIN_NAMESPACE_STD
 
 template<class _Tp> class _LIBCPP_TEMPLATE_VIS valarray;
@@ -4865,4 +4867,6 @@ end(const valarray<_Tp>& __v)
 
 _LIBCPP_END_NAMESPACE_STD
 
+_LIBCPP_POP_MACROS
+
 #endif  // _LIBCPP_VALARRAY
-- 
cgit v1.3