macro.c (stringify_arg): Escape CPP_WCHAR tokens.

libcpp/:
	* macro.c (stringify_arg): Escape CPP_WCHAR tokens.
gcc/testsuite/:
	* gcc.dg/20090902-1.c: New test.

From-SVN: r151343

gcc/testsuite/ChangeLog

+2009-09-02  Ian Lance Taylor  <iant@google.com>
+
+	* gcc.dg/20090902-1.c: New test.
+
 2009-09-02  Jakub Jelinek  <jakub@redhat.com>
 
 	* gcc.dg/builtin-object-size-9.c: New test.

gcc/testsuite/gcc.dg/20090902-1.c

+/* { dg-do compile } */
+#define STRING(x) #x
+char buf[] = STRING(L'\x123');

libcpp/ChangeLog

+2009-09-02  Ian Lance Taylor  <iant@google.com>
+
+	* macro.c (stringify_arg): Escape CPP_WCHAR tokens.
+
 2009-08-24  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
 	* configure.ac (AC_PREREQ): Bump to 2.64.

libcpp/macro.c

@@ -377,7 +377,7 @@ stringify_arg (cpp_reader *pfile, macro_arg *arg)
 	}
 
       escape_it = (token->type == CPP_STRING || token->type == CPP_CHAR
-		   || token->type == CPP_WSTRING || token->type == CPP_STRING
+		   || token->type == CPP_WSTRING || token->type == CPP_WCHAR
 		   || token->type == CPP_STRING32 || token->type == CPP_CHAR32
 		   || token->type == CPP_STRING16 || token->type == CPP_CHAR16);