diff options
| author | Bruno Haible <bruno@clisp.org> | 2012-01-07 04:26:07 +0100 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2012-01-07 04:26:07 +0100 |
| commit | 23fc715d33566ac4a49dca8ebacaa2b8d4b8491e (patch) | |
| tree | 2bd8ccd75cb07547969307722b13bb91590674c1 | |
| parent | 58b0dee19c95c9d1d38fa9d0a31333166724bc75 (diff) | |
| download | gettext-23fc715d33566ac4a49dca8ebacaa2b8d4b8491e.tar.gz | |
Update from gnulib.
| -rw-r--r-- | gettext-runtime/intl/ChangeLog | 7 | ||||
| -rw-r--r-- | gettext-runtime/intl/config.charset | 2 | ||||
| -rw-r--r-- | gettext-runtime/intl/localcharset.c | 12 | ||||
| -rw-r--r-- | gettext-runtime/intl/relocatable.c | 2 |
4 files changed, 16 insertions, 7 deletions
diff --git a/gettext-runtime/intl/ChangeLog b/gettext-runtime/intl/ChangeLog index 63767219f..a0ee27c5d 100644 --- 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 8505438d6..09f828798 100644 --- 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 1e44a0aa7..5d79f8336 100644 --- 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 68ceb71b8..ec9d7942e 100644 --- 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 () { |