Talk about "native Windows API", not "Woe32".
diff --git a/ChangeLog b/ChangeLog
index c047234..276a36a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-01-06 Bruno Haible <bruno@clisp.org>
+
+ Talk about "native Windows API", not "Woe32".
+ * lib/relocatable.c: Update comments to mention native Windows.
+
2012-01-04 Bruno Haible <bruno@clisp.org>
Talk about "native Windows API", not "Win32".
diff --git a/lib/relocatable.c b/lib/relocatable.c
index 8bd9483..ad11a91 100644
--- a/lib/relocatable.c
+++ b/lib/relocatable.c
@@ -396,7 +396,7 @@
/* 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 ()
{
diff --git a/libcharset/lib/ChangeLog b/libcharset/lib/ChangeLog
index 1f53fb9..29e231a 100644
--- a/libcharset/lib/ChangeLog
+++ b/libcharset/lib/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/libcharset/lib/config.charset b/libcharset/lib/config.charset
index b9dccbb..599e22c 100644
--- a/libcharset/lib/config.charset
+++ b/libcharset/lib/config.charset
@@ -31,6 +31,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/libcharset/lib/localcharset.c b/libcharset/lib/localcharset.c
index 1bbeb99..6da30dc 100644
--- a/libcharset/lib/localcharset.c
+++ b/libcharset/lib/localcharset.c
@@ -408,10 +408,10 @@
}
}
- /* 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
@@ -458,8 +458,8 @@
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/libcharset/lib/relocatable.c b/libcharset/lib/relocatable.c
index 8bd9483..ad11a91 100644
--- a/libcharset/lib/relocatable.c
+++ b/libcharset/lib/relocatable.c
@@ -396,7 +396,7 @@
/* 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 ()
{
