summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorredi <redi@138bc75d-0d04-0410-961f-82ee72b054a4>2016-01-29 12:29:42 +0000
committerredi <redi@138bc75d-0d04-0410-961f-82ee72b054a4>2016-01-29 12:29:42 +0000
commit1e64899267a0aa16e2240a84d5be564f910070a9 (patch)
tree1da03108d248585074c2fed1b1840c343865ea19
parentb622ec2512c6c1587c6fb40da475c9249901ac4f (diff)
downloadgcc-1e64899267a0aa16e2240a84d5be564f910070a9.tar.gz
Test __cplusplus instead of __GXX_EXPERIMENTAL_CXX0X__
* ginclude/stdarg.h: Test __cplusplus instead of __GXX_EXPERIMENTAL_CXX0X__. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@232977 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--gcc/ChangeLog5
-rw-r--r--gcc/ginclude/stdarg.h3
2 files changed, 7 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 3f5972c6664..ea443d3990e 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 74a234dd7f6..65251522ad4 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)