diff options
author | ian <ian@138bc75d-0d04-0410-961f-82ee72b054a4> | 2009-09-02 17:35:30 +0000 |
---|---|---|
committer | ian <ian@138bc75d-0d04-0410-961f-82ee72b054a4> | 2009-09-02 17:35:30 +0000 |
commit | 2a50bfcf98249aff98c8ad8383d0d419f06fd9b2 (patch) | |
tree | 582d9e320bdd5fa506744b2a48b6f499f314d056 /libcpp | |
parent | d450d76ecc6789c02c70692c225200a99b6facc1 (diff) | |
download | gcc-2a50bfcf98249aff98c8ad8383d0d419f06fd9b2.tar.gz |
libcpp/:
* macro.c (stringify_arg): Escape CPP_WCHAR tokens.
gcc/testsuite/:
* gcc.dg/20090902-1.c: New test.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@151343 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libcpp')
-rw-r--r-- | libcpp/ChangeLog | 4 | ||||
-rw-r--r-- | libcpp/macro.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/libcpp/ChangeLog b/libcpp/ChangeLog index f76fa181dde..1b020ac0ab8 100644 --- a/libcpp/ChangeLog +++ b/libcpp/ChangeLog @@ -1,3 +1,7 @@ +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. diff --git a/libcpp/macro.c b/libcpp/macro.c index e051fbc7757..f31805955c6 100644 --- a/libcpp/macro.c +++ b/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); |