Talk about "native Windows API", not "Woe32".

* lib/accept4.c: Update comments to mention native Windows.
* lib/execute.c: Likewise.
* lib/fatal-signal.c: Likewise.
* lib/localcharset.c: Likewise.
* lib/nanosleep.c: Likewise.
* lib/nl_langinfo.c: Likewise.
* lib/pclose.c: Likewise.
* lib/pipe-filter-gi.c: Likewise.
* lib/pipe-filter-ii.c: Likewise.
* lib/pipe.c: Likewise.
* lib/pipe2.c: Likewise.
* lib/popen.c: Likewise.
* lib/progreloc.c: Likewise.
* lib/relocatable.c: Likewise.
* lib/sigaction.c: Likewise.
* lib/sigprocmask.c: Likewise.
* lib/spawn-pipe.h: Likewise.
* lib/spawn-pipe.c: Likewise.
* lib/spawni.c: Likewise.
* lib/stat-time.h: Likewise.
* lib/w32spawn.h: Likewise.
* tests/test-isatty.c: Likewise.
* lib/config.charset: More comments.
* doc/gnulib-intro.texi: Mention native Windows.
* doc/posix-functions/_Exit_C99.texi: Likewise.
* doc/posix-headers/fcntl.texi: Likewise.

diff --git a/ChangeLog b/ChangeLog
index 628cebf..adbab93 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,33 @@
+2012-01-06  Bruno Haible  <bruno@clisp.org>
+
+       Talk about "native Windows API", not "Woe32".
+       * lib/accept4.c: Update comments to mention native Windows.
+       * lib/execute.c: Likewise.
+       * lib/fatal-signal.c: Likewise.
+       * lib/localcharset.c: Likewise.
+       * lib/nanosleep.c: Likewise.
+       * lib/nl_langinfo.c: Likewise.
+       * lib/pclose.c: Likewise.
+       * lib/pipe-filter-gi.c: Likewise.
+       * lib/pipe-filter-ii.c: Likewise.
+       * lib/pipe.c: Likewise.
+       * lib/pipe2.c: Likewise.
+       * lib/popen.c: Likewise.
+       * lib/progreloc.c: Likewise.
+       * lib/relocatable.c: Likewise.
+       * lib/sigaction.c: Likewise.
+       * lib/sigprocmask.c: Likewise.
+       * lib/spawn-pipe.h: Likewise.
+       * lib/spawn-pipe.c: Likewise.
+       * lib/spawni.c: Likewise.
+       * lib/stat-time.h: Likewise.
+       * lib/w32spawn.h: Likewise.
+       * tests/test-isatty.c: Likewise.
+       * lib/config.charset: More comments.
+       * doc/gnulib-intro.texi: Mention native Windows.
+       * doc/posix-functions/_Exit_C99.texi: Likewise.
+       * doc/posix-headers/fcntl.texi: Likewise.
+
 2012-01-06  Guillem Jover  <guillem@hadrons.org>  (tiny change)
 
        argp: Avoid crash if translator uses % characters in a translation.

diff --git a/doc/gnulib-intro.texi b/doc/gnulib-intro.texi
index 64faa35..d962ace 100644 (file)
--- a/doc/gnulib-intro.texi
+++ b/doc/gnulib-intro.texi
@@ -304,8 +304,8 @@ against the out-of-memory condition.
 Examples are a module for copying a file --- the portability problems
 relate to the copying of the file's modification time, access rights,
 and extended attributes --- or a module for extracting the tail
-component of a file name --- here the portability to Woe32 requires a
-different API than the classical POSIX @code{basename} function.
+component of a file name --- here the portability to native Windows
+requires a different API than the classical POSIX @code{basename} function.
 
 @subsection Reusable application code
 

diff --git a/doc/posix-functions/_Exit_C99.texi b/doc/posix-functions/_Exit_C99.texi
index cf2615e..e541034 100644 (file)
--- a/doc/posix-functions/_Exit_C99.texi
+++ b/doc/posix-functions/_Exit_C99.texi
@@ -2,7 +2,7 @@
 @section @code{_Exit}
 @findex _Exit
 @c This file would ideally be called _Exit.texi, but then it would collide
-@c with _exit.texi on case-insensitive file systems (MacOS X HFS+ and Woe32
+@c with _exit.texi on case-insensitive file systems (MacOS X HFS+ and Windows
 @c file systems).
 
 POSIX specification:@* @url{http://www.opengroup.org/onlinepubs/9699919799/functions/_Exit.html}

diff --git a/doc/posix-headers/fcntl.texi b/doc/posix-headers/fcntl.texi
index 332fe5a..606a27e 100644 (file)
--- a/doc/posix-headers/fcntl.texi
+++ b/doc/posix-headers/fcntl.texi
@@ -41,8 +41,8 @@ Cygwin.
 
 @item
 @samp{O_BINARY}, @samp{O_TEXT} (not specified by POSIX, but essential for
-portability to Woe32 platforms) are defined on some platforms but not on
-others.
+portability to native Windows platforms) are defined on some platforms but
+not on others.
 
 @item
 @samp{O_DIRECT}, @samp{O_NDELAY}, @samp{O_NOATIME},

diff --git a/lib/accept4.c b/lib/accept4.c
index 9e6b9d8..07dadb0 100644 (file)
--- a/lib/accept4.c
+++ b/lib/accept4.c
@@ -67,7 +67,7 @@ accept4 (int sockfd, struct sockaddr *addr, socklen_t *addrlen, int flags)
 
 #if SOCK_CLOEXEC
 # if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
-/* Native Woe32 API.  */
+/* Native Windows API.  */
   if (flags & SOCK_CLOEXEC)
     {
       HANDLE curr_process = GetCurrentProcess ();

diff --git a/lib/config.charset b/lib/config.charset
index be1d4c2..b227e06 100644 (file)
--- a/lib/config.charset
+++ b/lib/config.charset
@@ -30,6 +30,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/lib/execute.c b/lib/execute.c
index a10ca21..fc7165c 100644 (file)
--- a/lib/execute.c
+++ b/lib/execute.c
@@ -37,7 +37,7 @@
 
 #if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
 
-/* Native Woe32 API.  */
+/* Native Windows API.  */
 # include <process.h>
 # include "w32spawn.h"
 
@@ -106,7 +106,7 @@ execute (const char *progname,
 {
 #if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
 
-  /* Native Woe32 API.  */
+  /* Native Windows API.  */
   int orig_stdin;
   int orig_stdout;
   int orig_stderr;

diff --git a/lib/fatal-signal.c b/lib/fatal-signal.c
index 8b23edf..03e53ab 100644 (file)
--- a/lib/fatal-signal.c
+++ b/lib/fatal-signal.c
@@ -71,7 +71,7 @@ static int fatal_signals[] =
 #ifdef SIGXFSZ
     SIGXFSZ,
 #endif
-    /* Woe32 signals.  */
+    /* Native Windows signals.  */
 #ifdef SIGBREAK
     SIGBREAK,
 #endif

diff --git a/lib/localcharset.c b/lib/localcharset.c
index ea3c018..d86002c 100644 (file)
--- a/lib/localcharset.c
+++ b/lib/localcharset.c
@@ -407,10 +407,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
@@ -457,8 +457,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/lib/nanosleep.c b/lib/nanosleep.c
index 9f5816b..c9f4857 100644 (file)
--- a/lib/nanosleep.c
+++ b/lib/nanosleep.c
@@ -16,7 +16,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* written by Jim Meyering
-   and Bruno Haible for the Woe32 part */
+   and Bruno Haible for the native Windows part */
 
 #include <config.h>
 

diff --git a/lib/nl_langinfo.c b/lib/nl_langinfo.c
index a06b8d4..c73c769 100644 (file)
--- a/lib/nl_langinfo.c
+++ b/lib/nl_langinfo.c
@@ -141,7 +141,8 @@ nl_langinfo (nl_item item)
       {
         static char buf[2 + 10 + 1];
 
-        /* Woe32 has a function returning the locale's codepage as a number.  */
+        /* The Windows API has a function returning the locale's codepage as
+           a number.  */
         sprintf (buf, "CP%u", GetACP ());
         return buf;
       }

diff --git a/lib/pclose.c b/lib/pclose.c
index b186ec4..e9a8994 100644 (file)
--- a/lib/pclose.c
+++ b/lib/pclose.c
@@ -19,7 +19,7 @@
 /* Specification.  */
 #include <stdio.h>
 
-/* Native Woe32 API.  */
+/* Native Windows API.  */
 
 int
 pclose (FILE *stream)

diff --git a/lib/pipe-filter-gi.c b/lib/pipe-filter-gi.c
index f26412c..c1ccec3 100644 (file)
--- a/lib/pipe-filter-gi.c
+++ b/lib/pipe-filter-gi.c
@@ -96,7 +96,7 @@ static inline void filter_cleanup (struct pipe_filter_gi *filter,
 
 
 #if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
-/* Native Woe32 API.  */
+/* Native Windows API.  */
 
 static unsigned int WINAPI
 reader_thread_func (void *thread_arg)

diff --git a/lib/pipe-filter-ii.c b/lib/pipe-filter-ii.c
index 9162303..1e1d61e 100644 (file)
--- a/lib/pipe-filter-ii.c
+++ b/lib/pipe-filter-ii.c
@@ -155,7 +155,7 @@ pipe_filter_ii_execute (const char *progname,
     return -1;
 
 #if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
-  /* Native Woe32 API.  */
+  /* Native Windows API.  */
   /* Pipes have a non-blocking mode, see function SetNamedPipeHandleState and
      the article "Named Pipe Type, Read, and Wait Modes", but Microsoft's
      documentation discourages its use.  So don't use it.

diff --git a/lib/pipe.c b/lib/pipe.c
index 7b2c6bb..2780650 100644 (file)
--- a/lib/pipe.c
+++ b/lib/pipe.c
@@ -21,7 +21,7 @@
 #include <unistd.h>
 
 #if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
-/* Native Woe32 API.  */
+/* Native Windows API.  */
 
 /* Get _pipe().  */
 # include <io.h>

diff --git a/lib/pipe2.c b/lib/pipe2.c
index e7daa8e..02e01ca 100644 (file)
--- a/lib/pipe2.c
+++ b/lib/pipe2.c
@@ -31,7 +31,7 @@
 #endif
 
 #if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
-/* Native Woe32 API.  */
+/* Native Windows API.  */
 
 # include <io.h>
 
@@ -75,7 +75,7 @@ pipe2 (int fd[2], int flags)
     }
 
 #if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
-/* Native Woe32 API.  */
+/* Native Windows API.  */
 
   if (_pipe (fd, 4096, flags & ~O_NONBLOCK) < 0)
     {

diff --git a/lib/popen.c b/lib/popen.c
index dd36ae4..7b82bce 100644 (file)
--- a/lib/popen.c
+++ b/lib/popen.c
@@ -84,7 +84,7 @@ rpl_popen (const char *filename, const char *mode)
 }
 
 #else
-/* Native Woe32 API.  */
+/* Native Windows API.  */
 
 # include <string.h>
 

diff --git a/lib/progreloc.c b/lib/progreloc.c
index 5efd2f9..43a80dd 100644 (file)
--- a/lib/progreloc.c
+++ b/lib/progreloc.c
@@ -112,7 +112,7 @@ static int executable_fd = -1;
 static bool
 maybe_executable (const char *filename)
 {
-  /* Woe32 lacks the access() function.  */
+  /* The native Windows API lacks the access() function.  */
 #if !defined WINDOWS_NATIVE
   if (access (filename, X_OK) < 0)
     return false;
@@ -143,8 +143,8 @@ maybe_executable (const char *filename)
 
 /* Determine the full pathname of the current executable, freshly allocated.
    Return NULL if unknown.
-   Guaranteed to work on Linux and Woe32.  Likely to work on the other
-   Unixes (maybe except BeOS), under most conditions.  */
+   Guaranteed to work on Linux and native Windows.  Likely to work on the
+   other Unixes (maybe except BeOS), under most conditions.  */
 static char *
 find_executable (const char *argv0)
 {

diff --git a/lib/relocatable.c b/lib/relocatable.c
index 676c212..581440b 100644 (file)
--- a/lib/relocatable.c
+++ b/lib/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 ()
 {

diff --git a/lib/sigaction.c b/lib/sigaction.c
index 34793a5..659c4ec 100644 (file)
--- a/lib/sigaction.c
+++ b/lib/sigaction.c
@@ -24,7 +24,7 @@
 #include <stdint.h>
 #include <stdlib.h>
 
-/* This implementation of sigaction is tailored to Woe32 behavior:
+/* This implementation of sigaction is tailored to native Windows behavior:
    signal() has SysV semantics (ie. the handler is uninstalled before
    it is invoked).  This is an inherent data race if an asynchronous
    signal is sent twice in a row before we can reinstall our handler,

diff --git a/lib/sigprocmask.c b/lib/sigprocmask.c
index affffff..be53d54 100644 (file)
--- a/lib/sigprocmask.c
+++ b/lib/sigprocmask.c
@@ -32,7 +32,7 @@
    also does not have the POSIX sigaction() function, only the
    signal() function.  We also assume signal() has SysV semantics,
    where any handler is uninstalled prior to being invoked.  This is
-   true for Woe32 platforms.  */
+   true for native Windows platforms.  */
 
 /* We use raw signal(), but also provide a wrapper rpl_signal() so
    that applications can query or change a blocked signal.  */

diff --git a/lib/spawn-pipe.c b/lib/spawn-pipe.c
index 8e36c3d..fc7834d 100644 (file)
--- a/lib/spawn-pipe.c
+++ b/lib/spawn-pipe.c
@@ -37,7 +37,7 @@
 
 #if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
 
-/* Native Woe32 API.  */
+/* Native Windows API.  */
 # include <process.h>
 # include "w32spawn.h"
 
@@ -114,7 +114,7 @@ create_pipe (const char *progname,
 {
 #if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
 
-  /* Native Woe32 API.
+  /* Native Windows API.
      This uses _pipe(), dup2(), and spawnv().  It could also be implemented
      using the low-level functions CreatePipe(), DuplicateHandle(),
      CreateProcess() and _open_osfhandle(); see the GNU make and GNU clisp

diff --git a/lib/spawn-pipe.h b/lib/spawn-pipe.h
index 16b4baa..ea8ae8f 100644 (file)
--- a/lib/spawn-pipe.h
+++ b/lib/spawn-pipe.h
@@ -131,7 +131,7 @@ extern pid_t create_pipe_bidi (const char *progname,
 
 /* The name of the "always silent" device.  */
 #if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
-/* Native Woe32 API.  */
+/* Native Windows API.  */
 # define DEV_NULL "NUL"
 #else
 /* Unix API.  */

diff --git a/lib/spawni.c b/lib/spawni.c
index 6b080e2..649a4b9 100644 (file)
--- a/lib/spawni.c
+++ b/lib/spawni.c
@@ -91,7 +91,7 @@
 
 #if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
 
-/* Native Woe32 API.  */
+/* Native Windows API.  */
 int
 __spawni (pid_t *pid, const char *file,
           const posix_spawn_file_actions_t *file_actions,

diff --git a/lib/stat-time.h b/lib/stat-time.h
index c23ae9c..30c2acd 100644 (file)
--- a/lib/stat-time.h
+++ b/lib/stat-time.h
@@ -155,7 +155,7 @@ get_stat_birthtime (struct stat const *st)
   t.tv_sec = st->st_birthtime;
   t.tv_nsec = st->st_birthtimensec;
 #elif (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
-  /* Woe32 native platforms (but not Cygwin) put the "file creation
+  /* Native Windows platforms (but not Cygwin) put the "file creation
      time" in st_ctime (!).  See
      <http://msdn2.microsoft.com/de-de/library/14h5k7ff(VS.80).aspx>.  */
   t.tv_sec = st->st_ctime;

diff --git a/lib/w32spawn.h b/lib/w32spawn.h
index 0ed8e7f..4cdb843 100644 (file)
--- a/lib/w32spawn.h
+++ b/lib/w32spawn.h
@@ -1,4 +1,4 @@
-/* Auxiliary functions for the creation of subprocesses.  Native Woe32 API.
+/* Auxiliary functions for the creation of subprocesses.  Native Windows API.
    Copyright (C) 2001, 2003-2012 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 

diff --git a/tests/test-isatty.c b/tests/test-isatty.c
index a63080c..263e05e 100644 (file)
--- a/tests/test-isatty.c
+++ b/tests/test-isatty.c
@@ -28,7 +28,7 @@ SIGNATURE_CHECK (isatty, int, (int));
 
 /* The name of the "always silent" device.  */
 #if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
-/* Native Woe32 API.  */
+/* Native Windows API.  */
 # define DEV_NULL "NUL"
 #else
 /* Unix API.  */