binutils/

	* winduni.c (languages): Use \345 (octal syntax) rather than
	literal non-ASCII/non-UTF8 character in string literal.

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index cc02b139112f4325c106dace251506e2d1c6542b..d7421c10c6e119868bc9ab09cc81c25bbfdb88c9 100644 (file)
--- 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 8a96ac0edfaf9f606be9f8f4f2d6233598902d55..f3fb280706044fc0b2d0f9df1e027aad31c59fd5 100644 (file)
--- 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)