From: Bernd Edlinger <bernd.edlinger@hotmail.de>
Date: Tue, 23 Feb 2016 15:57:09 +0000 (+0000)
Subject: re PR libstdc++/69881 (with gcc-6 of today building gcc-4.9 fails)
X-Git-Tag: basepoints/gcc-7~803
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5f6dd5930f5fc05b5727dd435a6604cb2dace883;p=thirdparty%2Fgcc.git

re PR libstdc++/69881 (with gcc-6 of today building gcc-4.9 fails)

2016-02-23  Bernd Edlinger  <bernd.edlinger@hotmail.de>

        PR libstdc++/69881
        * include/c_global/cstdarg: Undefine __need___va_list.
        * include/c_global/cstddef: Undefine all kinds of __need_*.

From-SVN: r233636
---

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index be4e95cbb434..97170cd3d1a1 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+2016-02-23  Bernd Edlinger  <bernd.edlinger@hotmail.de>
+
+	PR libstdc++/69881
+	* include/c_global/cstdarg: Undefine __need___va_list.
+	* include/c_global/cstddef: Undefine all kinds of __need_*.
+
 2016-02-16  Tim Shen  <timshen@google.com>
 
 	PR libstdc++/69794
diff --git a/libstdc++-v3/include/c_global/cstdarg b/libstdc++-v3/include/c_global/cstdarg
index 390e1a2296e5..46cf5a274a5e 100644
--- a/libstdc++-v3/include/c_global/cstdarg
+++ b/libstdc++-v3/include/c_global/cstdarg
@@ -38,6 +38,7 @@
 
 #pragma GCC system_header
 
+#undef __need___va_list
 #include <bits/c++config.h>
 #include <stdarg.h>
 
diff --git a/libstdc++-v3/include/c_global/cstddef b/libstdc++-v3/include/c_global/cstddef
index e55bc820cb81..1739121001e7 100644
--- a/libstdc++-v3/include/c_global/cstddef
+++ b/libstdc++-v3/include/c_global/cstddef
@@ -41,6 +41,11 @@
 
 #pragma GCC system_header
 
+#undef __need_wchar_t
+#undef __need_ptrdiff_t
+#undef __need_size_t
+#undef __need_NULL
+#undef __need_wint_t
 #include <bits/c++config.h>
 #include <stddef.h>