summaryrefslogtreecommitdiff
path: root/binutils
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2013-10-11 17:24:26 +0000
committerRoland McGrath <roland@gnu.org>2013-10-11 17:24:26 +0000
commit59aedc0d77fc1844ec1bcee05a639acc0e0b2ab4 (patch)
treefbce4aecc497c5b5785f59e01b282abfcef115fa /binutils
parent2ea710e0dfeb61de737ffe1d2f7453e36867d992 (diff)
downloadbinutils-redhat-59aedc0d77fc1844ec1bcee05a639acc0e0b2ab4.tar.gz
binutils/
* winduni.c (languages): Use \345 (octal syntax) rather than literal non-ASCII/non-UTF8 character in string literal.
Diffstat (limited to 'binutils')
-rw-r--r--binutils/ChangeLog3
-rw-r--r--binutils/winduni.c6
2 files changed, 6 insertions, 3 deletions
diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index cc02b13911..d7421c10c6 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,5 +1,8 @@
2013-10-11 Roland McGrath <mcgrathr@google.com>
+ * winduni.c (languages): Use \345 (octal syntax) rather than
+ literal non-ASCII/non-UTF8 character in string literal.
+
* readelf.c (print_dynamic_symbol): Use array subscript syntax
rather than addition syntax with string literal.
diff --git a/binutils/winduni.c b/binutils/winduni.c
index 8a96ac0edf..f3fb280706 100644
--- a/binutils/winduni.c
+++ b/binutils/winduni.c
@@ -51,7 +51,7 @@ static int unichar_isascii (const unichar *, rc_uint_type);
/* Convert an ASCII string to a unicode string. We just copy it,
expanding chars to shorts, rather than doing something intelligent. */
-
+
#if !defined (_WIN32) && !defined (__CYGWIN__)
/* Codepages mapped. */
@@ -101,7 +101,7 @@ static const wind_language_t languages[] =
{ 0x040D, 862, 1255, "Hebrew", "Israel" }, { 0x040E, 852, 1250, "Hungarian", "Hungary" },
{ 0x040F, 850, 1252, "Icelandic", "Iceland" }, { 0x0410, 850, 1252, "Italian", "Italy" },
{ 0x0411, 932, 932, "Japanese", "Japan" }, { 0x0412, 949, 949, "Korean", "Korea (south)" },
- { 0x0413, 850, 1252, "Dutch", "Netherlands" }, { 0x0414, 850, 1252, "Norwegian (Bokmål)", "Norway" },
+ { 0x0413, 850, 1252, "Dutch", "Netherlands" }, { 0x0414, 850, 1252, "Norwegian (Bokm\345l)", "Norway" },
{ 0x0415, 852, 1250, "Polish", "Poland" }, { 0x0416, 850, 1252, "Portuguese", "Brazil" },
{ 0x0418, 852, 1250, "Romanian", "Romania" }, { 0x0419, 866, 1251, "Russian", "Russia" },
{ 0x041A, 852, 1250, "Croatian", "Croatia" }, { 0x041B, 852, 1250, "Slovak", "Slovakia" },
@@ -750,7 +750,7 @@ wind_MultiByteToWideChar (rc_uint_type cp, const char *mb,
#if defined (_WIN32) || defined (__CYGWIN__)
rc_uint_type conv_flags = MB_PRECOMPOSED;
- /* MB_PRECOMPOSED is not allowed for UTF-7 or UTF-8.
+ /* MB_PRECOMPOSED is not allowed for UTF-7 or UTF-8.
MultiByteToWideChar will set the last error to
ERROR_INVALID_FLAGS if we do. */
if (cp == CP_UTF8 || cp == CP_UTF7)