Update from gnulib.

diff --git a/gettext-runtime/intl/ChangeLog b/gettext-runtime/intl/ChangeLog
index 63767219fe483967efcee773b930d7a8c7d6e1f2..a0ee27c5d3b82339781269eaa5c3a61271bf8fab 100644 (file)
--- a/gettext-runtime/intl/ChangeLog
+++ b/gettext-runtime/intl/ChangeLog
@@ -1,3 +1,10 @@
+2012-01-06  Bruno Haible  <bruno@clisp.org>
+
+       Talk about "native Windows API", not "Woe32".
+       * localcharset.c: Update comments to mention native Windows.
+       * relocatable.c: Likewise.
+       * config.charset: More comments.
+
 2012-01-04  Bruno Haible  <bruno@clisp.org>
 
        Talk about "native Windows API", not "Win32".

diff --git a/gettext-runtime/intl/config.charset b/gettext-runtime/intl/config.charset
index 8505438d63d54b8d9abb61c18d3a6dfe8f9ee6e9..09f8287984fa889755fc4231b6eef23d9c649fdc 100644 (file)
--- a/gettext-runtime/intl/config.charset
+++ b/gettext-runtime/intl/config.charset
@@ -29,6 +29,8 @@
 # The current list of GNU canonical charset names is as follows.
 #
 #       name              MIME?             used by which systems
+#                                    (darwin = MacOS X, woe32 = native Windows)
+#
 #   ASCII, ANSI_X3.4-1968       glibc solaris freebsd netbsd darwin cygwin
 #   ISO-8859-1              Y   glibc aix hpux irix osf solaris freebsd netbsd openbsd darwin cygwin
 #   ISO-8859-2              Y   glibc aix hpux irix osf solaris freebsd netbsd openbsd darwin cygwin

diff --git a/gettext-runtime/intl/localcharset.c b/gettext-runtime/intl/localcharset.c
index 1e44a0aa787cada9d6b33452422cdad139b3cef4..5d79f83361e42edcfe55db78a0dc0270e8861f8f 100644 (file)
--- a/gettext-runtime/intl/localcharset.c
+++ b/gettext-runtime/intl/localcharset.c
@@ -406,10 +406,10 @@ locale_charset (void)
             }
         }
 
-      /* Woe32 has a function returning the locale's codepage as a number:
-         GetACP().  This encoding is used by Cygwin, unless the user has set
-         the environment variable CYGWIN=codepage:oem (which very few people
-         do).
+      /* The Windows API has a function returning the locale's codepage as a
+         number: GetACP().  This encoding is used by Cygwin, unless the user
+         has set the environment variable CYGWIN=codepage:oem (which very few
+         people do).
          Output directed to console windows needs to be converted (to
          GetOEMCP() if the console is using a raster font, or to
          GetConsoleOutputCP() if it is using a TrueType font).  Cygwin does
@@ -456,8 +456,8 @@ locale_charset (void)
 
   static char buf[2 + 10 + 1];
 
-  /* Woe32 has a function returning the locale's codepage as a number:
-     GetACP().
+  /* The Windows API has a function returning the locale's codepage as a
+     number: GetACP().
      When the output goes to a console window, it needs to be provided in
      GetOEMCP() encoding if the console is using a raster font, or in
      GetConsoleOutputCP() encoding if it is using a TrueType font.

diff --git a/gettext-runtime/intl/relocatable.c b/gettext-runtime/intl/relocatable.c
index 68ceb71b8d2aabdd21fc6387f58f13a0fa551b4e..ec9d7942e67ada5017fabb7a973e505a262aa5e1 100644 (file)
--- a/gettext-runtime/intl/relocatable.c
+++ b/gettext-runtime/intl/relocatable.c
@@ -394,7 +394,7 @@ find_shared_library_fullname ()
 
 /* Return the full pathname of the current shared library.
    Return NULL if unknown.
-   Guaranteed to work only on Linux, Cygwin and Woe32.  */
+   Guaranteed to work only on Linux, Cygwin, and native Windows.  */
 static char *
 get_shared_library_fullname ()
 {