Test __cplusplus instead of __GXX_EXPERIMENTAL_CXX0X__

	* ginclude/stdarg.h: Test __cplusplus instead of
	__GXX_EXPERIMENTAL_CXX0X__.

From-SVN: r232977

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 3f5972c6664cc1f78d084fe4f5456f478dfd6fde..ea443d3990eb827250196fb50b08b4080d09164d 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2016-01-29  Jonathan Wakely  <jwakely@redhat.com>
+
+       * ginclude/stdarg.h: Test __cplusplus instead of
+       __GXX_EXPERIMENTAL_CXX0X__.
+
 2016-01-29  Richard Biener  <rguenther@suse.de>
 
        PR tree-optimization/69547

diff --git a/gcc/ginclude/stdarg.h b/gcc/ginclude/stdarg.h
index 74a234dd7f6afd13057eea9bc574f95ade352406..65251522ad46df427b043031bedba5b3fdd81543 100644 (file)
--- a/gcc/ginclude/stdarg.h
+++ b/gcc/ginclude/stdarg.h
@@ -47,7 +47,8 @@ typedef __builtin_va_list __gnuc_va_list;
 #define va_start(v,l)  __builtin_va_start(v,l)
 #define va_end(v)      __builtin_va_end(v)
 #define va_arg(v,l)    __builtin_va_arg(v,l)
-#if !defined(__STRICT_ANSI__) || __STDC_VERSION__ + 0 >= 199900L || defined(__GXX_EXPERIMENTAL_CXX0X__)
+#if !defined(__STRICT_ANSI__) || __STDC_VERSION__ + 0 >= 199900L \
+    || __cplusplus + 0 >= 201103L
 #define va_copy(d,s)   __builtin_va_copy(d,s)
 #endif
 #define __va_copy(d,s) __builtin_va_copy(d,s)