2006-12-07  Benjamin Kosnik  <bkoz@redhat.com>

	* c-cppbuiltin.c (c_cpp_builtins): __GXX_EXPERIMENTAL_CPP0X__ to
	__GXX_EXPERIMENTAL_CXX0X__.
	* doc/cpp.texi: Same.

Index: doc/cpp.texi
===================================================================
--- doc/cpp.texi	(revision 119633)
+++ doc/cpp.texi	(working copy)
@@ -2094,7 +2094,7 @@
 mechanism based on @code{setjmp} and @code{longjmp} for exception
 handling.
 
-@item __GXX_EXPERIMENTAL_CPP0X__
+@item __GXX_EXPERIMENTAL_CXX0X__
 This macro is defined when compiling a C++ source file with the option
 @option{-std=c++0x} or @option{-std=gnu++0x}. It indicates that some
 features likely to be included in C++0x are available. Note that these
Index: c-cppbuiltin.c
===================================================================
--- c-cppbuiltin.c	(revision 119633)
+++ c-cppbuiltin.c	(working copy)
@@ -1,5 +1,5 @@
 /* Define builtin-in macros for the C family front ends.
-   Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GCC.
 
@@ -410,7 +410,7 @@
       if (warn_deprecated)
 	cpp_define (pfile, "__DEPRECATED");
       if (flag_cpp0x)
-        cpp_define (pfile, "__GXX_EXPERIMENTAL_CPP0X__");
+        cpp_define (pfile, "__GXX_EXPERIMENTAL_CXX0X__");
     }
   /* Note that we define this for C as well, so that we know if
      __attribute__((cleanup)) will interface with EH.  */