From: Jonathan Wakely <jwakely@redhat.com>
Date: Fri, 29 Jan 2016 12:29:42 +0000 (+0000)
Subject: Test __cplusplus instead of __GXX_EXPERIMENTAL_CXX0X__
X-Git-Tag: basepoints/gcc-7~1221
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=382ead25f462c0275ae0a0e1c6b0614405fa71c5;p=thirdparty%2Fgcc.git

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 3f5972c6664c..ea443d3990eb 100644
--- 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 74a234dd7f6a..65251522ad46 100644
--- 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)