decl.c (init_decl_processing): Change definition of __wchar_t to wchar_t.

2000-11-07  Eric Christopher  <echristo@redhat.com>

        * decl.c (init_decl_processing): Change definition of
        __wchar_t to wchar_t.  Remove artificial declaration of
        wchar_t.
        * lex.c: Change instances of __wchar_t to wchar_t.

From-SVN: r37348

gcc/cp/ChangeLog

+2000-11-07  Eric Christopher  <echristo@redhat.com>
+
+        * decl.c (init_decl_processing): Change definition of
+        __wchar_t to wchar_t.  Remove artificial declaration of
+        wchar_t.
+        * lex.c: Change instances of __wchar_t to wchar_t.
+
 2000-11-09  Nathan Sidwell  <nathan@codesourcery.com>
 
 	* lex.c (do_identifier): Don't lookup_name for operators.

gcc/cp/decl.c

@@ -6576,12 +6576,7 @@ init_decl_processing ()
     wchar_type_node = make_signed_type (wchar_type_size);
   else
     wchar_type_node = make_unsigned_type (wchar_type_size);
-  record_builtin_type (RID_WCHAR, "__wchar_t", wchar_type_node);
-
-  /* Artificial declaration of wchar_t -- can be bashed */
-  wchar_decl_node = build_decl (TYPE_DECL, get_identifier ("wchar_t"),
-				wchar_type_node);
-  pushdecl (wchar_decl_node);
+  record_builtin_type (RID_WCHAR, "wchar_t", wchar_type_node);
 
   /* This is for wide string constants.  */
   wchar_array_type_node

gcc/cp/lex.c

@@ -443,7 +443,6 @@ static const struct resword reswords[] =
   { "__typeof__",	RID_TYPEOF,	0 },
   { "__volatile",	RID_VOLATILE,	0 },
   { "__volatile__",	RID_VOLATILE,	0 },
-  { "__wchar_t",	RID_WCHAR,	0 },
   { "asm",		RID_ASM,	D_ASM },
   { "and",		RID_AND,	D_OPNAME },
   { "and_eq",		RID_AND_EQ,	D_OPNAME },
@@ -515,6 +514,7 @@ static const struct resword reswords[] =
   { "virtual",		RID_VIRTUAL,	0 },
   { "void",		RID_VOID,	0 },
   { "volatile",		RID_VOLATILE,	0 },
+  { "wchar_t",          RID_WCHAR,	0 },
   { "while",		RID_WHILE,	0 },
   { "xor",		RID_XOR,	D_OPNAME },
   { "xor_eq",		RID_XOR_EQ,	D_OPNAME },