diff options
author | law <law@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-11-30 05:16:36 +0000 |
---|---|---|
committer | law <law@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-11-30 05:16:36 +0000 |
commit | bc4381667a31bd5f1e677d64c789b1e959df00d5 (patch) | |
tree | a6b80dca8f72a2e7640e4d535901e42325b2a954 /libcpp/expr.c | |
parent | 1cd66bce1663eb648638d311b493de0dcc4146c3 (diff) | |
parent | 738c50b853f5ba0eaf93e23f6d29cbac761eef9e (diff) | |
download | gcc-reload-v2a.tar.gz |
Weekly merge from trunk. No regressions.reload-v2a
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/reload-v2a@181834 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libcpp/expr.c')
-rw-r--r-- | libcpp/expr.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libcpp/expr.c b/libcpp/expr.c index 7bbc72d6f26..d56e56a6311 100644 --- a/libcpp/expr.c +++ b/libcpp/expr.c @@ -284,9 +284,9 @@ cpp_userdef_char_remove_type (enum cpp_ttype type) else if (type == CPP_WCHAR_USERDEF) return CPP_WCHAR; else if (type == CPP_CHAR16_USERDEF) - return CPP_STRING16; + return CPP_CHAR16; else if (type == CPP_CHAR32_USERDEF) - return CPP_STRING32; + return CPP_CHAR32; else return type; } |