summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libcpp/ChangeLog6
-rw-r--r--libcpp/charset.c1
2 files changed, 7 insertions, 0 deletions
diff --git a/libcpp/ChangeLog b/libcpp/ChangeLog
index 09d39629f41..3cb4e807919 100644
--- a/libcpp/ChangeLog
+++ b/libcpp/ChangeLog
@@ -1,3 +1,9 @@
+2008-06-12 H.J. Lu <hongjiu.lu@intel.com>
+
+ PR preprocessor/36479
+ * charset.c (cpp_interpret_string_notranslate): Also set
+ narrow_cset_desc.width.
+
2008-06-07 Joseph Myers <joseph@codesourcery.com>
* configure.ac (parisc*64*-*-*): Remove.
diff --git a/libcpp/charset.c b/libcpp/charset.c
index d70d05cc020..73e55eef039 100644
--- a/libcpp/charset.c
+++ b/libcpp/charset.c
@@ -1412,6 +1412,7 @@ cpp_interpret_string_notranslate (cpp_reader *pfile, const cpp_string *from,
pfile->narrow_cset_desc.func = convert_no_conversion;
pfile->narrow_cset_desc.cd = (iconv_t) -1;
+ pfile->narrow_cset_desc.width = CPP_OPTION (pfile, char_precision);
retval = cpp_interpret_string (pfile, from, count, to, CPP_STRING);