aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libstdc++-v3/ChangeLog6
-rw-r--r--libstdc++-v3/include/c_global/cstdarg1
-rw-r--r--libstdc++-v3/include/c_global/cstddef5
3 files changed, 12 insertions, 0 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index be4e95cbb43..97170cd3d1a 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 390e1a2296e..46cf5a274a5 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 e55bc820cb8..1739121001e 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>