From 1b612639b0d75ca13f87f3ae5b1eda423cb21655 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Wed, 4 Jan 2012 14:31:33 +0100 Subject: [PATCH] Talk about "native Windows API", not "Win32". * lib/classpath.c: Update comments to mention native Windows. * lib/csharpexec.c: Likewise. * lib/dup2.c: Likewise. * lib/error.c: Likewise. * lib/fcntl.c: Likewise. * lib/filename.h: Likewise. * lib/findprog.c: Likewise. * lib/get-rusage-as.c: Likewise. * lib/get-rusage-data.c: Likewise. * lib/getpagesize.c: Likewise. * lib/javaexec.c: Likewise. * lib/msvc-inval.c: Likewise. * lib/msvc-nothrow.c: Likewise. * lib/nanosleep.c: Likewise. * lib/nonblocking.c: Likewise. * lib/printf-parse.c: Likewise. * lib/setlocale.c: Likewise. * lib/sigaction.c: Likewise. * lib/strerror_r.c: Likewise. * lib/tmpdir.c: Likewise. * lib/vasnprintf.c: Likewise. * lib/w32spawn.h: Likewise. * lib/waitpid.c: Likewise. * lib/stdio.in.h (fdopen, fopen, freopen): Likewise. * m4/locale-ar.m4: Likewise. * m4/locale-fr.m4: Likewise. * m4/locale-ja.m4: Likewise. * m4/locale-tr.m4: Likewise. * m4/locale-zh.m4: Likewise. * m4/printf.m4: Likewise. * tests/test-cloexec.c: Likewise. * tests/test-copy-acl.sh: Likewise. * tests/test-copy-file.sh: Likewise. * tests/test-file-has-acl.sh: Likewise. * tests/test-set-mode-acl.sh: Likewise. * tests/test-dup-safer.c: Likewise. * tests/test-dup2.c: Likewise. * tests/test-dup3.c: Likewise. * tests/test-fcntl.c: Likewise. * tests/test-nonblocking-pipe.h: Likewise. * tests/test-nonblocking-socket.h: Likewise. * tests/test-pipe.c: Likewise. * tests/test-pipe2.c: Likewise. * tests/test-spawn-pipe-child.c: Likewise. * doc/acl-resources.txt: Likewise. * lib/getaddrinfo.c (WINDOWS_NATIVE): Renamed from WIN32_NATIVE. * tests/test-poll.c (WINDOWS_NATIVE): Likewise. * tests/test-select.h (WINDOWS_NATIVE): Likewise. * lib/localcharset.c: Update comments to mention native Windows. (WINDOWS_NATIVE): Renamed from WIN32_NATIVE. * lib/localename.c: Likewise. * lib/progreloc.c: Likewise. * lib/relocatable.c: Likewise. * lib/poll.c (WINDOWS_NATIVE): Renamed from WIN32_NATIVE. (windows_compute_revents): Renamed from win32_compute_revents. (windows_compute_revents_socket): Renamed from win32_compute_revents_socket. * lib/select.c: Update comments to mention native Windows. (windows_poll_handle): Renamed from win32_poll_handle. * m4/threadlib.m4: Update comments to mention native Windows. (gl_THREADLIB_EARLY_BODY, gl_THREADLIB_BODY): Expect --enable-threads=windows instead of --enable-threads=win32. Set USE_WINDOWS_THREADS, not USE_WIN32_THREADS. * lib/glthread/lock.h: Update comments to mention native Windows. (USE_WINDOWS_THREADS): Renamed from USE_WIN32_THREADS. * lib/glthread/lock.c (USE_WINDOWS_THREADS): Renamed from USE_WIN32_THREADS. * lib/glthread/cond.h (USE_WINDOWS_THREADS): Likewise. * lib/glthread/cond.c (USE_WINDOWS_THREADS): Likewise. * lib/glthread/thread.h (USE_WINDOWS_THREADS): Likewise. * lib/glthread/thread.c (USE_WINDOWS_THREADS): Likewise. * lib/glthread/tls.h (USE_WINDOWS_THREADS): Likewise. * lib/glthread/tls.c (USE_WINDOWS_THREADS): Likewise. * lib/glthread/yield.h (USE_WINDOWS_THREADS): Likewise. * tests/test-cond.c (USE_WINDOWS_THREADS): Likewise. * tests/test-thread_create.c (USE_WINDOWS_THREADS): Likewise. * tests/test-lock.c (USE_WINDOWS_THREADS): Likewise. (TEST_WINDOWS_THREADS): Renamed from TEST_WIN32_THREADS. * tests/test-tls.c: Likewise. Rationale: Microsoft renamed the "Win32 API" to "Windows API", as it is available on both 32-bit and 64-bit Windows systems. But in gnulib, we treat Cygwin like a Unix platform, therefore the main line of distinction is between "native Windows" on one side and Unix/ POSIX systems on the other side. More details in . Suggested by Paul Eggert. --- ChangeLog | 91 +++++++++++++++++++++++++++++++++++++++++ doc/acl-resources.txt | 2 +- lib/classpath.c | 2 +- lib/csharpexec.c | 2 +- lib/dup2.c | 2 +- lib/error.c | 9 ++-- lib/fcntl.c | 2 +- lib/filename.h | 2 +- lib/findprog.c | 2 +- lib/get-rusage-as.c | 4 +- lib/get-rusage-data.c | 4 +- lib/getaddrinfo.c | 10 ++--- lib/getpagesize.c | 2 +- lib/glthread/cond.c | 2 +- lib/glthread/cond.h | 4 +- lib/glthread/lock.c | 2 +- lib/glthread/lock.h | 14 +++---- lib/glthread/thread.c | 2 +- lib/glthread/thread.h | 4 +- lib/glthread/tls.c | 2 +- lib/glthread/tls.h | 4 +- lib/glthread/yield.h | 4 +- lib/javaexec.c | 2 +- lib/localcharset.c | 16 ++++---- lib/localename.c | 24 +++++------ lib/msvc-inval.c | 2 +- lib/msvc-nothrow.c | 2 +- lib/nanosleep.c | 4 +- lib/nonblocking.c | 10 +++-- lib/poll.c | 20 ++++----- lib/printf-parse.c | 2 +- lib/progreloc.c | 16 ++++---- lib/relocatable.c | 14 +++---- lib/select.c | 17 ++++---- lib/setlocale.c | 2 +- lib/sigaction.c | 6 +-- lib/stdio.in.h | 6 +-- lib/strerror_r.c | 12 +++--- lib/tmpdir.c | 2 +- lib/vasnprintf.c | 4 +- lib/w32spawn.h | 6 +-- lib/waitpid.c | 2 +- m4/locale-ar.m4 | 6 +-- m4/locale-fr.m4 | 10 ++--- m4/locale-ja.m4 | 9 ++-- m4/locale-tr.m4 | 6 +-- m4/locale-zh.m4 | 6 +-- m4/printf.m4 | 4 +- m4/threadlib.m4 | 32 ++++++++------- tests/test-cloexec.c | 4 +- tests/test-cond.c | 2 +- tests/test-copy-acl.sh | 2 +- tests/test-copy-file.sh | 2 +- tests/test-dup-safer.c | 6 +-- tests/test-dup2.c | 6 +-- tests/test-dup3.c | 4 +- tests/test-fcntl.c | 6 +-- tests/test-file-has-acl.sh | 2 +- tests/test-lock.c | 12 +++--- tests/test-nonblocking-pipe.h | 2 +- tests/test-nonblocking-socket.h | 4 +- tests/test-pipe.c | 4 +- tests/test-pipe2.c | 4 +- tests/test-poll.c | 8 ++-- tests/test-select.h | 8 ++-- tests/test-set-mode-acl.sh | 2 +- tests/test-spawn-pipe-child.c | 4 +- tests/test-thread_create.c | 2 +- tests/test-tls.c | 6 +-- 69 files changed, 302 insertions(+), 202 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2e35ff71b..b5e324360 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,94 @@ +2012-01-04 Bruno Haible + + Talk about "native Windows API", not "Win32". + * lib/classpath.c: Update comments to mention native Windows. + * lib/csharpexec.c: Likewise. + * lib/dup2.c: Likewise. + * lib/error.c: Likewise. + * lib/fcntl.c: Likewise. + * lib/filename.h: Likewise. + * lib/findprog.c: Likewise. + * lib/get-rusage-as.c: Likewise. + * lib/get-rusage-data.c: Likewise. + * lib/getpagesize.c: Likewise. + * lib/javaexec.c: Likewise. + * lib/msvc-inval.c: Likewise. + * lib/msvc-nothrow.c: Likewise. + * lib/nanosleep.c: Likewise. + * lib/nonblocking.c: Likewise. + * lib/printf-parse.c: Likewise. + * lib/setlocale.c: Likewise. + * lib/sigaction.c: Likewise. + * lib/strerror_r.c: Likewise. + * lib/tmpdir.c: Likewise. + * lib/vasnprintf.c: Likewise. + * lib/w32spawn.h: Likewise. + * lib/waitpid.c: Likewise. + * lib/stdio.in.h (fdopen, fopen, freopen): Likewise. + * m4/locale-ar.m4: Likewise. + * m4/locale-fr.m4: Likewise. + * m4/locale-ja.m4: Likewise. + * m4/locale-tr.m4: Likewise. + * m4/locale-zh.m4: Likewise. + * m4/printf.m4: Likewise. + * tests/test-cloexec.c: Likewise. + * tests/test-copy-acl.sh: Likewise. + * tests/test-copy-file.sh: Likewise. + * tests/test-file-has-acl.sh: Likewise. + * tests/test-set-mode-acl.sh: Likewise. + * tests/test-dup-safer.c: Likewise. + * tests/test-dup2.c: Likewise. + * tests/test-dup3.c: Likewise. + * tests/test-fcntl.c: Likewise. + * tests/test-nonblocking-pipe.h: Likewise. + * tests/test-nonblocking-socket.h: Likewise. + * tests/test-pipe.c: Likewise. + * tests/test-pipe2.c: Likewise. + * tests/test-spawn-pipe-child.c: Likewise. + * doc/acl-resources.txt: Likewise. + * lib/getaddrinfo.c (WINDOWS_NATIVE): Renamed from WIN32_NATIVE. + * tests/test-poll.c (WINDOWS_NATIVE): Likewise. + * tests/test-select.h (WINDOWS_NATIVE): Likewise. + * lib/localcharset.c: Update comments to mention native Windows. + (WINDOWS_NATIVE): Renamed from WIN32_NATIVE. + * lib/localename.c: Likewise. + * lib/progreloc.c: Likewise. + * lib/relocatable.c: Likewise. + * lib/poll.c (WINDOWS_NATIVE): Renamed from WIN32_NATIVE. + (windows_compute_revents): Renamed from win32_compute_revents. + (windows_compute_revents_socket): Renamed from + win32_compute_revents_socket. + * lib/select.c: Update comments to mention native Windows. + (windows_poll_handle): Renamed from win32_poll_handle. + * m4/threadlib.m4: Update comments to mention native Windows. + (gl_THREADLIB_EARLY_BODY, gl_THREADLIB_BODY): Expect + --enable-threads=windows instead of --enable-threads=win32. Set + USE_WINDOWS_THREADS, not USE_WIN32_THREADS. + * lib/glthread/lock.h: Update comments to mention native Windows. + (USE_WINDOWS_THREADS): Renamed from USE_WIN32_THREADS. + * lib/glthread/lock.c (USE_WINDOWS_THREADS): Renamed from + USE_WIN32_THREADS. + * lib/glthread/cond.h (USE_WINDOWS_THREADS): Likewise. + * lib/glthread/cond.c (USE_WINDOWS_THREADS): Likewise. + * lib/glthread/thread.h (USE_WINDOWS_THREADS): Likewise. + * lib/glthread/thread.c (USE_WINDOWS_THREADS): Likewise. + * lib/glthread/tls.h (USE_WINDOWS_THREADS): Likewise. + * lib/glthread/tls.c (USE_WINDOWS_THREADS): Likewise. + * lib/glthread/yield.h (USE_WINDOWS_THREADS): Likewise. + * tests/test-cond.c (USE_WINDOWS_THREADS): Likewise. + * tests/test-thread_create.c (USE_WINDOWS_THREADS): Likewise. + * tests/test-lock.c (USE_WINDOWS_THREADS): Likewise. + (TEST_WINDOWS_THREADS): Renamed from TEST_WIN32_THREADS. + * tests/test-tls.c: Likewise. + Rationale: + Microsoft renamed the "Win32 API" to "Windows API", as it is available + on both 32-bit and 64-bit Windows systems. + But in gnulib, we treat Cygwin like a Unix platform, therefore the main + line of distinction is between "native Windows" on one side and Unix/ + POSIX systems on the other side. More details in + . + Suggested by Paul Eggert. + 2012-01-03 Bruno Haible isatty: Support for MSVC 9. diff --git a/doc/acl-resources.txt b/doc/acl-resources.txt index 06fd118f4..26d5cc707 100644 --- a/doc/acl-resources.txt +++ b/doc/acl-resources.txt @@ -476,7 +476,7 @@ Utilities: setfacl -Win32 ACLs +Native Windows ACLs Introduction: http://setacl.sourceforge.net/html/doc-basics.html diff --git a/lib/classpath.c b/lib/classpath.c index fbda9ea67..7f4397b2b 100644 --- a/lib/classpath.c +++ b/lib/classpath.c @@ -34,7 +34,7 @@ /* Separator in PATH like lists of pathnames. */ #if ((defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__) || defined __EMX__ || defined __DJGPP__ - /* Win32, OS/2, DOS */ + /* Native Windows, OS/2, DOS */ # define PATH_SEPARATOR ';' #else /* Unix */ diff --git a/lib/csharpexec.c b/lib/csharpexec.c index e2ab61aa6..d432f97a0 100644 --- a/lib/csharpexec.c +++ b/lib/csharpexec.c @@ -44,7 +44,7 @@ /* Handling of clix' PATH variable is just like Java CLASSPATH. */ #if defined _WIN32 || defined __WIN32__ || defined __CYGWIN__ - /* Win32, Cygwin */ + /* Native Windows, Cygwin */ #define CLASSPATHVAR "PATH" #elif defined __APPLE__ && defined __MACH__ /* MacOS X */ diff --git a/lib/dup2.c b/lib/dup2.c index 313b619df..f6d0f1c73 100644 --- a/lib/dup2.c +++ b/lib/dup2.c @@ -31,7 +31,7 @@ # if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ -/* Get declarations of the Win32 API functions. */ +/* Get declarations of the native Windows API functions. */ # define WIN32_LEAN_AND_MEAN # include diff --git a/lib/error.c b/lib/error.c index b253ef7c4..0bc899e8f 100644 --- a/lib/error.c +++ b/lib/error.c @@ -89,7 +89,7 @@ extern void __error_at_line (int status, int errnum, const char *file_name, # include # if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ -/* Get declarations of the Win32 API functions. */ +/* Get declarations of the native Windows API functions. */ # define WIN32_LEAN_AND_MEAN # include /* Get _get_osfhandle. */ @@ -125,9 +125,10 @@ static inline int is_open (int fd) { # if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ - /* On Win32: The initial state of unassigned standard file descriptors is - that they are open but point to an INVALID_HANDLE_VALUE. There is no - fcntl, and the gnulib replacement fcntl does not support F_GETFL. */ + /* On native Windows: The initial state of unassigned standard file + descriptors is that they are open but point to an INVALID_HANDLE_VALUE. + There is no fcntl, and the gnulib replacement fcntl does not support + F_GETFL. */ return (HANDLE) _get_osfhandle (fd) != INVALID_HANDLE_VALUE; # else # ifndef F_GETFL diff --git a/lib/fcntl.c b/lib/fcntl.c index 161508a1d..e989d972d 100644 --- a/lib/fcntl.c +++ b/lib/fcntl.c @@ -33,7 +33,7 @@ #undef fcntl #if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ -/* Get declarations of the Win32 API functions. */ +/* Get declarations of the native Windows API functions. */ # define WIN32_LEAN_AND_MEAN # include diff --git a/lib/filename.h b/lib/filename.h index 75c85249a..7b89d0d06 100644 --- a/lib/filename.h +++ b/lib/filename.h @@ -29,7 +29,7 @@ extern "C" { IS_PATH_WITH_DIR(P) tests whether P contains a directory specification. */ #if defined _WIN32 || defined __WIN32__ || defined __CYGWIN__ || defined __EMX__ || defined __DJGPP__ - /* Win32, Cygwin, OS/2, DOS */ + /* Native Windows, Cygwin, OS/2, DOS */ # define ISSLASH(C) ((C) == '/' || (C) == '\\') # define HAS_DEVICE(P) \ ((((P)[0] >= 'A' && (P)[0] <= 'Z') || ((P)[0] >= 'a' && (P)[0] <= 'z')) \ diff --git a/lib/findprog.c b/lib/findprog.c index ffd8d38f1..8096f3ffd 100644 --- a/lib/findprog.c +++ b/lib/findprog.c @@ -39,7 +39,7 @@ const char * find_in_path (const char *progname) { #if defined _WIN32 || defined __WIN32__ || defined __CYGWIN__ || defined __EMX__ || defined __DJGPP__ - /* Win32, Cygwin, OS/2, DOS */ + /* Native Windows, Cygwin, OS/2, DOS */ /* The searching rules with .COM, .EXE, .BAT, .CMD etc. suffixes are too complicated. Leave it to the OS. */ return progname; diff --git a/lib/get-rusage-as.c b/lib/get-rusage-as.c index 83e7cd851..a946ef133 100644 --- a/lib/get-rusage-as.c +++ b/lib/get-rusage-as.c @@ -98,11 +98,11 @@ get_rusage_as_via_setrlimit() therefore produces a wrong value. b) The /proc/$pid/maps file lists only the memory areas belonging to the executable and shared libraries, not the anonymous memory. - But the native Win32 API works. + But the native Windows API works. mingw: a) There is no setrlimit function. - b) The native Win32 API works. + b) The native Windows API works. BeOS, Haiku: a) On BeOS, there is no setrlimit function. diff --git a/lib/get-rusage-data.c b/lib/get-rusage-data.c index 33e8f687d..b0ac7f10a 100644 --- a/lib/get-rusage-data.c +++ b/lib/get-rusage-data.c @@ -105,7 +105,7 @@ get_rusage_data_via_setrlimit() therefore produces a wrong value. b) The /proc/$pid/maps file lists only the memory areas belonging to the executable and shared libraries, not the anonymous memory. - But the native Win32 API works. + But the native Windows API works. Note that malloc() apparently falls back on mmap() for large allocations. mingw: @@ -341,7 +341,7 @@ static inline uintptr_t get_rusage_data_via_iterator (void) { # if ((defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__) || defined __BEOS__ || defined __HAIKU__ - /* On mingw, there is no sbrk() function. + /* On native Windows, there is no sbrk() function. On Haiku, sbrk(0) always returns 0. */ static void *brk_value; diff --git a/lib/getaddrinfo.c b/lib/getaddrinfo.c index b9a7692d8..d9bc058d4 100644 --- a/lib/getaddrinfo.c +++ b/lib/getaddrinfo.c @@ -56,13 +56,13 @@ #endif #if defined _WIN32 || defined __WIN32__ -# define WIN32_NATIVE +# define WINDOWS_NATIVE #endif /* gl_sockets_startup */ #include "sockets.h" -#ifdef WIN32_NATIVE +#ifdef WINDOWS_NATIVE typedef int (WSAAPI *getaddrinfo_func) (const char*, const char*, const struct addrinfo*, struct addrinfo**); @@ -153,7 +153,7 @@ getaddrinfo (const char *restrict nodename, }; #endif -#ifdef WIN32_NATIVE +#ifdef WINDOWS_NATIVE if (use_win32_p ()) return getaddrinfo_ptr (nodename, servname, hints, res); #endif @@ -336,7 +336,7 @@ getaddrinfo (const char *restrict nodename, void freeaddrinfo (struct addrinfo *ai) { -#ifdef WIN32_NATIVE +#ifdef WINDOWS_NATIVE if (use_win32_p ()) { freeaddrinfo_ptr (ai); @@ -362,7 +362,7 @@ getnameinfo (const struct sockaddr *restrict sa, socklen_t salen, char *restrict service, socklen_t servicelen, int flags) { -#ifdef WIN32_NATIVE +#ifdef WINDOWS_NATIVE if (use_win32_p ()) return getnameinfo_ptr (sa, salen, node, nodelen, service, servicelen, flags); diff --git a/lib/getpagesize.c b/lib/getpagesize.c index f9b92062b..02c00fbea 100644 --- a/lib/getpagesize.c +++ b/lib/getpagesize.c @@ -22,7 +22,7 @@ /* Specification. */ #include -/* This implementation is only for native Win32 systems. */ +/* This implementation is only for native Windows systems. */ #if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ # define WIN32_LEAN_AND_MEAN diff --git a/lib/glthread/cond.c b/lib/glthread/cond.c index 23ed971bc..9d7fbfb6b 100644 --- a/lib/glthread/cond.c +++ b/lib/glthread/cond.c @@ -73,7 +73,7 @@ glthread_cond_timedwait_multithreaded (gl_cond_t *cond, /* ========================================================================= */ -#if USE_WIN32_THREADS +#if USE_WINDOWS_THREADS #include diff --git a/lib/glthread/cond.h b/lib/glthread/cond.h index 6a8df654e..6359d68fd 100644 --- a/lib/glthread/cond.h +++ b/lib/glthread/cond.h @@ -269,7 +269,7 @@ extern int glthread_cond_timedwait_multithreaded (gl_cond_t *cond, gl_lock_t *lo /* ========================================================================= */ -#if USE_WIN32_THREADS +#if USE_WINDOWS_THREADS # define WIN32_LEAN_AND_MEAN /* avoid including junk */ # include @@ -330,7 +330,7 @@ extern int glthread_cond_destroy_func (gl_cond_t *cond); /* ========================================================================= */ -#if !(USE_POSIX_THREADS || USE_PTH_THREADS || USE_SOLARIS_THREADS || USE_WIN32_THREADS) +#if !(USE_POSIX_THREADS || USE_PTH_THREADS || USE_SOLARIS_THREADS || USE_WINDOWS_THREADS) /* Provide dummy implementation if threads are not supported. */ diff --git a/lib/glthread/lock.c b/lib/glthread/lock.c index 2cf394ebb..8d522ea4f 100644 --- a/lib/glthread/lock.c +++ b/lib/glthread/lock.c @@ -630,7 +630,7 @@ glthread_once_singlethreaded (gl_once_t *once_control) /* ========================================================================= */ -#if USE_WIN32_THREADS +#if USE_WINDOWS_THREADS /* -------------------------- gl_lock_t datatype -------------------------- */ diff --git a/lib/glthread/lock.h b/lib/glthread/lock.h index 7fa1a9365..eb165f3f9 100644 --- a/lib/glthread/lock.h +++ b/lib/glthread/lock.h @@ -614,7 +614,7 @@ extern int glthread_once_singlethreaded (gl_once_t *once_control); /* ========================================================================= */ -#if USE_WIN32_THREADS +#if USE_WINDOWS_THREADS # define WIN32_LEAN_AND_MEAN /* avoid including junk */ # include @@ -623,8 +623,8 @@ extern int glthread_once_singlethreaded (gl_once_t *once_control); extern "C" { # endif -/* We can use CRITICAL_SECTION directly, rather than the Win32 Event, Mutex, - Semaphore types, because +/* We can use CRITICAL_SECTION directly, rather than the native Windows Event, + Mutex, Semaphore types, because - we need only to synchronize inside a single process (address space), not inter-process locking, - we don't need to support trylock operations. (TryEnterCriticalSection @@ -710,9 +710,9 @@ extern int glthread_rwlock_destroy_func (gl_rwlock_t *lock); /* --------------------- gl_recursive_lock_t datatype --------------------- */ -/* The Win32 documentation says that CRITICAL_SECTION already implements a - recursive lock. But we need not rely on it: It's easy to implement a - recursive lock without this assumption. */ +/* The native Windows documentation says that CRITICAL_SECTION already + implements a recursive lock. But we need not rely on it: It's easy to + implement a recursive lock without this assumption. */ typedef struct { @@ -764,7 +764,7 @@ extern void glthread_once_func (gl_once_t *once_control, void (*initfunction) (v /* ========================================================================= */ -#if !(USE_POSIX_THREADS || USE_PTH_THREADS || USE_SOLARIS_THREADS || USE_WIN32_THREADS) +#if !(USE_POSIX_THREADS || USE_PTH_THREADS || USE_SOLARIS_THREADS || USE_WINDOWS_THREADS) /* Provide dummy implementation if threads are not supported. */ diff --git a/lib/glthread/thread.c b/lib/glthread/thread.c index 6cbca6f54..4c259c7bf 100644 --- a/lib/glthread/thread.c +++ b/lib/glthread/thread.c @@ -43,7 +43,7 @@ const gl_thread_t gl_null_thread /* = { .p = NULL } */; /* ========================================================================= */ -#if USE_WIN32_THREADS +#if USE_WINDOWS_THREADS #include diff --git a/lib/glthread/thread.h b/lib/glthread/thread.h index 6272f15e1..8f9ca8f1a 100644 --- a/lib/glthread/thread.h +++ b/lib/glthread/thread.h @@ -290,7 +290,7 @@ typedef thread_t gl_thread_t; /* ========================================================================= */ -#if USE_WIN32_THREADS +#if USE_WINDOWS_THREADS # define WIN32_LEAN_AND_MEAN /* avoid including junk */ # include @@ -337,7 +337,7 @@ extern int gl_thread_exit_func (void *retval); /* ========================================================================= */ -#if !(USE_POSIX_THREADS || USE_PTH_THREADS || USE_SOLARIS_THREADS || USE_WIN32_THREADS) +#if !(USE_POSIX_THREADS || USE_PTH_THREADS || USE_SOLARIS_THREADS || USE_WINDOWS_THREADS) /* Provide dummy implementation if threads are not supported. */ diff --git a/lib/glthread/tls.c b/lib/glthread/tls.c index f4c6fa9f1..661d011e8 100644 --- a/lib/glthread/tls.c +++ b/lib/glthread/tls.c @@ -54,7 +54,7 @@ glthread_tls_get_multithreaded (thread_key_t key) /* ========================================================================= */ -#if USE_WIN32_THREADS +#if USE_WINDOWS_THREADS #endif diff --git a/lib/glthread/tls.h b/lib/glthread/tls.h index 29f6e8000..0330eb359 100644 --- a/lib/glthread/tls.h +++ b/lib/glthread/tls.h @@ -220,7 +220,7 @@ extern void *glthread_tls_get_multithreaded (thread_key_t key); /* ========================================================================= */ -#if USE_WIN32_THREADS +#if USE_WINDOWS_THREADS # define WIN32_LEAN_AND_MEAN /* avoid including junk */ # include @@ -242,7 +242,7 @@ typedef DWORD gl_tls_key_t; /* ========================================================================= */ -#if !(USE_POSIX_THREADS || USE_PTH_THREADS || USE_SOLARIS_THREADS || USE_WIN32_THREADS) +#if !(USE_POSIX_THREADS || USE_PTH_THREADS || USE_SOLARIS_THREADS || USE_WINDOWS_THREADS) /* Provide dummy implementation if threads are not supported. */ diff --git a/lib/glthread/yield.h b/lib/glthread/yield.h index 683c82908..b727c0b24 100644 --- a/lib/glthread/yield.h +++ b/lib/glthread/yield.h @@ -89,7 +89,7 @@ extern "C" { /* ========================================================================= */ -#if USE_WIN32_THREADS +#if USE_WINDOWS_THREADS # define WIN32_LEAN_AND_MEAN /* avoid including junk */ # include @@ -109,7 +109,7 @@ extern "C" { /* ========================================================================= */ -#if !(USE_POSIX_THREADS || USE_PTH_THREADS || USE_SOLARIS_THREADS || USE_WIN32_THREADS) +#if !(USE_POSIX_THREADS || USE_PTH_THREADS || USE_SOLARIS_THREADS || USE_WINDOWS_THREADS) /* Provide dummy implementation if threads are not supported. */ diff --git a/lib/javaexec.c b/lib/javaexec.c index cc571a6f8..071e8220f 100644 --- a/lib/javaexec.c +++ b/lib/javaexec.c @@ -358,7 +358,7 @@ execute_java_class (const char *class_name, } #if defined _WIN32 || defined __WIN32__ || defined __CYGWIN__ - /* Win32, Cygwin */ + /* Native Windows, Cygwin */ { static bool jview_tested; static bool jview_present; diff --git a/lib/localcharset.c b/lib/localcharset.c index cd97e6ca3..ea3c01830 100644 --- a/lib/localcharset.c +++ b/lib/localcharset.c @@ -34,7 +34,7 @@ #endif #if defined _WIN32 || defined __WIN32__ -# define WIN32_NATIVE +# define WINDOWS_NATIVE #endif #if defined __EMX__ @@ -44,7 +44,7 @@ # endif #endif -#if !defined WIN32_NATIVE +#if !defined WINDOWS_NATIVE # include # if HAVE_LANGINFO_CODESET # include @@ -57,7 +57,7 @@ # define WIN32_LEAN_AND_MEAN # include # endif -#elif defined WIN32_NATIVE +#elif defined WINDOWS_NATIVE # define WIN32_LEAN_AND_MEAN # include #endif @@ -83,7 +83,7 @@ #endif #if defined _WIN32 || defined __WIN32__ || defined __CYGWIN__ || defined __EMX__ || defined __DJGPP__ - /* Win32, Cygwin, OS/2, DOS */ + /* Native Windows, Cygwin, OS/2, DOS */ # define ISSLASH(C) ((C) == '/' || (C) == '\\') #endif @@ -123,7 +123,7 @@ get_charset_aliases (void) cp = charset_aliases; if (cp == NULL) { -#if !(defined DARWIN7 || defined VMS || defined WIN32_NATIVE || defined __CYGWIN__) +#if !(defined DARWIN7 || defined VMS || defined WINDOWS_NATIVE || defined __CYGWIN__) const char *dir; const char *base = "charset.alias"; char *file_name; @@ -308,7 +308,7 @@ get_charset_aliases (void) "DECKOREAN" "\0" "EUC-KR" "\0"; # endif -# if defined WIN32_NATIVE || defined __CYGWIN__ +# if defined WINDOWS_NATIVE || defined __CYGWIN__ /* To avoid the troubles of installing a separate file in the same directory as the DLL and of retrieving the DLL's directory at runtime, simply inline the aliases here. */ @@ -360,7 +360,7 @@ locale_charset (void) const char *codeset; const char *aliases; -#if !(defined WIN32_NATIVE || defined OS2) +#if !(defined WINDOWS_NATIVE || defined OS2) # if HAVE_LANGINFO_CODESET @@ -453,7 +453,7 @@ locale_charset (void) # endif -#elif defined WIN32_NATIVE +#elif defined WINDOWS_NATIVE static char buf[2 + 10 + 1]; diff --git a/lib/localename.c b/lib/localename.c index d5cf83efd..b59916802 100644 --- a/lib/localename.c +++ b/lib/localename.c @@ -15,7 +15,7 @@ along with this program. If not, see . */ /* Written by Ulrich Drepper , 1995. */ -/* Win32 code written by Tor Lillqvist . */ +/* Native Windows code written by Tor Lillqvist . */ /* MacOS X code written by Bruno Haible . */ #include @@ -54,10 +54,10 @@ #endif #if defined _WIN32 || defined __WIN32__ -# define WIN32_NATIVE +# define WINDOWS_NATIVE #endif -#if defined WIN32_NATIVE || defined __CYGWIN__ /* WIN32 or Cygwin */ +#if defined WINDOWS_NATIVE || defined __CYGWIN__ /* Native Windows or Cygwin */ # define WIN32_LEAN_AND_MEAN # include /* List of language codes, sorted by value: @@ -1405,11 +1405,11 @@ gl_locale_name_canonicalize (char *name) #endif -#if defined WIN32_NATIVE || defined __CYGWIN__ /* WIN32 or Cygwin */ +#if defined WINDOWS_NATIVE || defined __CYGWIN__ /* Native Windows or Cygwin */ -/* Canonicalize a Win32 native locale name to a Unix locale name. +/* Canonicalize a Windows native locale name to a Unix locale name. NAME is a sufficiently large buffer. - On input, it contains the Win32 locale name. + On input, it contains the Windows locale name. On output, it contains the Unix locale name. */ # if !defined IN_LIBINTL static @@ -1465,9 +1465,9 @@ gl_locale_name_from_win32_LANGID (LANGID langid) } /* Internet Explorer has an LCID to RFC3066 name mapping stored in HKEY_CLASSES_ROOT\Mime\Database\Rfc1766. But we better don't use that - since IE's i18n subsystem is known to be inconsistent with the Win32 base - (e.g. they have different character conversion facilities that produce - different results). */ + since IE's i18n subsystem is known to be inconsistent with the native + Windows base (e.g. they have different character conversion facilities + that produce different results). */ /* Use our own table. */ { int primary, sub; @@ -2866,7 +2866,7 @@ gl_locale_name_default (void) "C.UTF-8" locale, which operates in the same way as the "C" locale. */ -#if !(HAVE_CFLOCALECOPYCURRENT || HAVE_CFPREFERENCESCOPYAPPVALUE || defined WIN32_NATIVE || defined __CYGWIN__) +#if !(HAVE_CFLOCALECOPYCURRENT || HAVE_CFPREFERENCESCOPYAPPVALUE || defined WINDOWS_NATIVE || defined __CYGWIN__) /* The system does not have a way of setting the locale, other than the POSIX specified environment variables. We use C as default locale. */ @@ -2921,11 +2921,11 @@ gl_locale_name_default (void) # endif -# if defined WIN32_NATIVE || defined __CYGWIN__ /* WIN32 or Cygwin */ +# if defined WINDOWS_NATIVE || defined __CYGWIN__ /* Native Windows or Cygwin */ { LCID lcid; - /* Use native Win32 API locale ID. */ + /* Use native Windows API locale ID. */ lcid = GetThreadLocale (); return gl_locale_name_from_win32_LCID (lcid); diff --git a/lib/msvc-inval.c b/lib/msvc-inval.c index 538fabc74..cf5c7b64a 100644 --- a/lib/msvc-inval.c +++ b/lib/msvc-inval.c @@ -40,7 +40,7 @@ gl_msvc_invalid_parameter_handler (const wchar_t *expression, # else -/* Get declarations of the Win32 API functions. */ +/* Get declarations of the native Windows API functions. */ # define WIN32_LEAN_AND_MEAN # include diff --git a/lib/msvc-nothrow.c b/lib/msvc-nothrow.c index e65f35235..46a11955c 100644 --- a/lib/msvc-nothrow.c +++ b/lib/msvc-nothrow.c @@ -21,7 +21,7 @@ /* Specification. */ #include "msvc-nothrow.h" -/* Get declarations of the Win32 API functions. */ +/* Get declarations of the native Windows API functions. */ #define WIN32_LEAN_AND_MEAN #include diff --git a/lib/nanosleep.c b/lib/nanosleep.c index 6204a1f37..9f5816bd6 100644 --- a/lib/nanosleep.c +++ b/lib/nanosleep.c @@ -87,12 +87,12 @@ nanosleep (const struct timespec *requested_delay, } #elif (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ -/* Windows platforms. */ +/* Native Windows platforms. */ # define WIN32_LEAN_AND_MEAN # include -/* The Win32 function Sleep() has a resolution of about 15 ms and takes +/* The Windows API function Sleep() has a resolution of about 15 ms and takes at least 5 ms to execute. We use this function for longer time periods. Additionally, we use busy-looping over short time periods, to get a resolution of about 0.01 ms. In order to measure such short timespans, diff --git a/lib/nonblocking.c b/lib/nonblocking.c index 59bd55fd1..744dd5a4d 100644 --- a/lib/nonblocking.c +++ b/lib/nonblocking.c @@ -22,13 +22,13 @@ #include #if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ -/* Native Woe32 API. */ +/* Native Windows API. */ # include # include # include -/* Get declarations of the Win32 API functions. */ +/* Get declarations of the native Windows API functions. */ # define WIN32_LEAN_AND_MEAN # include @@ -56,7 +56,8 @@ get_nonblocking_flag (int desc) return -1; } else - /* Win32 does not support non-blocking on regular files. */ + /* The native Windows API does not support non-blocking on regular + files. */ return 0; } @@ -102,7 +103,8 @@ set_nonblocking_flag (int desc, bool value) } else { - /* Win32 does not support non-blocking on regular files. */ + /* The native Windows API does not support non-blocking on regular + files. */ if (!value) return 0; errno = ENOTSUP; diff --git a/lib/poll.c b/lib/poll.c index bd19eaee0..9688677f3 100644 --- a/lib/poll.c +++ b/lib/poll.c @@ -37,7 +37,7 @@ #include #if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ -# define WIN32_NATIVE +# define WINDOWS_NATIVE # include # include # include @@ -69,7 +69,7 @@ # define MSG_PEEK 0 #endif -#ifdef WIN32_NATIVE +#ifdef WINDOWS_NATIVE /* Optimized test whether a HANDLE refers to a console. See . */ @@ -128,7 +128,7 @@ typedef DWORD (WINAPI *PNtQueryInformationFile) for the handle, eliminate them from *P_SOUGHT. */ static int -win32_compute_revents (HANDLE h, int *p_sought) +windows_compute_revents (HANDLE h, int *p_sought) { int i, ret, happened; INPUT_RECORD *irbuffer; @@ -226,7 +226,7 @@ win32_compute_revents (HANDLE h, int *p_sought) /* Convert fd_sets returned by select into revents values. */ static int -win32_compute_revents_socket (SOCKET h, int sought, long lNetworkEvents) +windows_compute_revents_socket (SOCKET h, int sought, long lNetworkEvents) { int happened = 0; @@ -320,7 +320,7 @@ compute_revents (int fd, int sought, fd_set *rfds, fd_set *wfds, fd_set *efds) int poll (struct pollfd *pfd, nfds_t nfd, int timeout) { -#ifndef WIN32_NATIVE +#ifndef WINDOWS_NATIVE fd_set rfds, wfds, efds; struct timeval tv; struct timeval *ptv; @@ -503,9 +503,9 @@ restart: { /* Poll now. If we get an event, do not poll again. Also, screen buffer handles are waitable, and they'll block until - a character is available. win32_compute_revents eliminates + a character is available. windows_compute_revents eliminates bits for the "wrong" direction. */ - pfd[i].revents = win32_compute_revents (h, &sought); + pfd[i].revents = windows_compute_revents (h, &sought); if (sought) handle_array[nhandles++] = h; if (pfd[i].revents) @@ -581,14 +581,14 @@ restart: if (FD_ISSET ((SOCKET) h, &xfds)) ev.lNetworkEvents |= FD_OOB; - happened = win32_compute_revents_socket ((SOCKET) h, pfd[i].events, - ev.lNetworkEvents); + happened = windows_compute_revents_socket ((SOCKET) h, pfd[i].events, + ev.lNetworkEvents); } else { /* Not a socket. */ int sought = pfd[i].events; - happened = win32_compute_revents (h, &sought); + happened = windows_compute_revents (h, &sought); nhandles++; } diff --git a/lib/printf-parse.c b/lib/printf-parse.c index 44b51145a..69b3f834f 100644 --- a/lib/printf-parse.c +++ b/lib/printf-parse.c @@ -421,7 +421,7 @@ PRINTF_PARSE (const CHAR_T *format, DIRECTIVES *d, arguments *a) } #endif #if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ - /* On native Win32, PRIdMAX is defined as "I64d". + /* On native Windows, PRIdMAX is defined as "I64d". We cannot change it to "lld" because PRIdMAX must also be understood by the system's printf routines. */ else if (*cp == 'I' && cp[1] == '6' && cp[2] == '4') diff --git a/lib/progreloc.c b/lib/progreloc.c index 274e84e53..5efd2f95e 100644 --- a/lib/progreloc.c +++ b/lib/progreloc.c @@ -36,10 +36,10 @@ #endif #if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__ -# define WIN32_NATIVE +# define WINDOWS_NATIVE #endif -#ifdef WIN32_NATIVE +#ifdef WINDOWS_NATIVE # define WIN32_LEAN_AND_MEAN # include #endif @@ -74,7 +74,7 @@ extern char * canonicalize_file_name (const char *name); IS_PATH_WITH_DIR(P) tests whether P contains a directory specification. */ #if ((defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__) || defined __EMX__ || defined __DJGPP__ - /* Win32, OS/2, DOS */ + /* Native Windows, OS/2, DOS */ # define ISSLASH(C) ((C) == '/' || (C) == '\\') # define HAS_DEVICE(P) \ ((((P)[0] >= 'A' && (P)[0] <= 'Z') || ((P)[0] >= 'a' && (P)[0] <= 'z')) \ @@ -113,7 +113,7 @@ static bool maybe_executable (const char *filename) { /* Woe32 lacks the access() function. */ -#if !defined WIN32_NATIVE +#if !defined WINDOWS_NATIVE if (access (filename, X_OK) < 0) return false; #endif @@ -148,11 +148,11 @@ maybe_executable (const char *filename) static char * find_executable (const char *argv0) { -#if defined WIN32_NATIVE - /* Native Win32 only. +#if defined WINDOWS_NATIVE + /* Native Windows only. On Cygwin, it is better to use the Cygwin provided /proc interface, than - to use native Win32 API and cygwin_conv_to_posix_path, because it supports - longer file names + to use native Windows API and cygwin_conv_to_posix_path, because it + supports longer file names (see ). */ char location[MAX_PATH]; int length = GetModuleFileName (NULL, location, sizeof (location)); diff --git a/lib/relocatable.c b/lib/relocatable.c index 7de3c5357..676c2123e 100644 --- a/lib/relocatable.c +++ b/lib/relocatable.c @@ -70,7 +70,7 @@ IS_PATH_WITH_DIR(P) tests whether P contains a directory specification. */ #if ((defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__) || defined __EMX__ || defined __DJGPP__ - /* Win32, OS/2, DOS */ + /* Native Windows, OS/2, DOS */ # define ISSLASH(C) ((C) == '/' || (C) == '\\') # define HAS_DEVICE(P) \ ((((P)[0] >= 'A' && (P)[0] <= 'Z') || ((P)[0] >= 'a' && (P)[0] <= 'z')) \ @@ -89,7 +89,7 @@ It allows libraries to be have been installed with a different original prefix than the program. But it is quite costly, especially on Cygwin platforms, see below. Therefore we enable it by default only on native - Win32 platforms. */ + Windows platforms. */ #ifndef ENABLE_COSTLY_RELOCATABLE # if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__ # define ENABLE_COSTLY_RELOCATABLE 1 @@ -249,7 +249,7 @@ compute_curr_prefix (const char *orig_installprefix, often case-insensitive. It's better to accept the comparison if the difference is only in case, rather than to fail. */ #if defined _WIN32 || defined __WIN32__ || defined __CYGWIN__ || defined __EMX__ || defined __DJGPP__ - /* Win32, Cygwin, OS/2, DOS - case insignificant file system */ + /* Native Windows, Cygwin, OS/2, DOS - case insignificant file system */ if ((*rpi >= 'a' && *rpi <= 'z' ? *rpi - 'a' + 'A' : *rpi) != (*cpi >= 'a' && *cpi <= 'z' ? *cpi - 'a' + 'A' : *cpi)) break; @@ -303,10 +303,10 @@ compute_curr_prefix (const char *orig_installprefix, static char *shared_library_fullname; #if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__ -/* Native Win32 only. +/* Native Windows only. On Cygwin, it is better to use the Cygwin provided /proc interface, than - to use native Win32 API and cygwin_conv_to_posix_path, because it supports - longer file names + to use native Windows API and cygwin_conv_to_posix_path, because it + supports longer file names (see ). */ /* Determine the full pathname of the shared library when it is loaded. */ @@ -390,7 +390,7 @@ find_shared_library_fullname () #endif } -#endif /* WIN32 / Unix */ +#endif /* Native Windows / Unix */ /* Return the full pathname of the current shared library. Return NULL if unknown. diff --git a/lib/select.c b/lib/select.c index 390b6c221..3c1eeb19e 100644 --- a/lib/select.c +++ b/lib/select.c @@ -24,7 +24,7 @@ #include #if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ -/* Native Win32. */ +/* Native Windows. */ #include #include @@ -97,11 +97,14 @@ IsSocketHandle (HANDLE h) return ev.lNetworkEvents != 0xDEADBEEF; } -/* Compute output fd_sets for libc descriptor FD (whose Win32 handle is H). */ +/* Compute output fd_sets for libc descriptor FD (whose Windows handle is + H). */ static int -win32_poll_handle (HANDLE h, int fd, struct bitset *rbits, struct bitset *wbits, - struct bitset *xbits) +windows_poll_handle (HANDLE h, int fd, + struct bitset *rbits, + struct bitset *wbits, + struct bitset *xbits) { BOOL read, write, except; int i, ret; @@ -371,7 +374,7 @@ rpl_select (int nfds, fd_set *rfds, fd_set *wfds, fd_set *xfds, /* Poll now. If we get an event, do not wait below. */ if (wait_timeout != 0 - && win32_poll_handle (h, i, &rbits, &wbits, &xbits)) + && windows_poll_handle (h, i, &rbits, &wbits, &xbits)) wait_timeout = 0; } } @@ -448,7 +451,7 @@ rpl_select (int nfds, fd_set *rfds, fd_set *wfds, fd_set *xfds, { /* Not a socket. */ nhandles++; - win32_poll_handle (h, i, &rbits, &wbits, &xbits); + windows_poll_handle (h, i, &rbits, &wbits, &xbits); if (rbits.out[i / CHAR_BIT] & (1 << (i & (CHAR_BIT - 1)))) { rc++; @@ -470,7 +473,7 @@ rpl_select (int nfds, fd_set *rfds, fd_set *wfds, fd_set *xfds, return rc; } -#else /* ! Native Win32. */ +#else /* ! Native Windows. */ #include diff --git a/lib/setlocale.c b/lib/setlocale.c index caa1b8754..8a47cdefc 100644 --- a/lib/setlocale.c +++ b/lib/setlocale.c @@ -74,7 +74,7 @@ category_to_name (int category) # if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ -/* The native Win32 setlocale() function expects locale names of the form +/* The native Windows setlocale() function expects locale names of the form "German" or "German_Germany" or "DEU", but not "de" or "de_DE". We need to convert the names from the form with ISO 639 language code and ISO 3166 country code to the form with English names or with three-letter identifier. diff --git a/lib/sigaction.c b/lib/sigaction.c index f37ffe270..34793a5cb 100644 --- a/lib/sigaction.c +++ b/lib/sigaction.c @@ -39,9 +39,9 @@ - We don't implement SA_NOCLDSTOP or SA_NOCLDWAIT, because SIGCHLD is not defined. - We don't implement SA_ONSTACK, because sigaltstack() is not present. - - We ignore SA_RESTART, because blocking Win32 calls are not interrupted - anyway when an asynchronous signal occurs, and the MSVCRT runtime - never sets errno to EINTR. + - We ignore SA_RESTART, because blocking native Windows API calls are + not interrupted anyway when an asynchronous signal occurs, and the + MSVCRT runtime never sets errno to EINTR. - We don't implement SA_SIGINFO because it is impossible to do so portably. diff --git a/lib/stdio.in.h b/lib/stdio.in.h index c91205294..db6308b9a 100644 --- a/lib/stdio.in.h +++ b/lib/stdio.in.h @@ -186,7 +186,7 @@ _GL_CXXALIASWARN (fdopen); #elif defined GNULIB_POSIXCHECK # undef fdopen /* Assume fdopen is always declared. */ -_GL_WARN_ON_USE (fdopen, "fdopen on Win32 platforms is not POSIX compatible - " +_GL_WARN_ON_USE (fdopen, "fdopen on native Windows platforms is not POSIX compliant - " "use gnulib module fdopen for portability"); #endif @@ -259,7 +259,7 @@ _GL_CXXALIASWARN (fopen); #elif defined GNULIB_POSIXCHECK # undef fopen /* Assume fopen is always declared. */ -_GL_WARN_ON_USE (fopen, "fopen on Win32 platforms is not POSIX compatible - " +_GL_WARN_ON_USE (fopen, "fopen on native Windows platforms is not POSIX compliant - " "use gnulib module fopen for portability"); #endif @@ -387,7 +387,7 @@ _GL_CXXALIASWARN (freopen); # undef freopen /* Assume freopen is always declared. */ _GL_WARN_ON_USE (freopen, - "freopen on Win32 platforms is not POSIX compatible - " + "freopen on native Windows platforms is not POSIX compliant - " "use gnulib module freopen for portability"); #endif diff --git a/lib/strerror_r.c b/lib/strerror_r.c index 29298ed3c..be76b0d37 100644 --- a/lib/strerror_r.c +++ b/lib/strerror_r.c @@ -241,13 +241,13 @@ strerror_r (int errnum, char *buf, size_t buflen) /* Try to do what strerror (errnum) does, but without clobbering the buffer used by strerror(). */ -# if defined __NetBSD__ || defined __hpux || ((defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__) || defined __CYGWIN__ /* NetBSD, HP-UX, native Win32, Cygwin */ +# if defined __NetBSD__ || defined __hpux || ((defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__) || defined __CYGWIN__ /* NetBSD, HP-UX, native Windows, Cygwin */ - /* NetBSD: sys_nerr, sys_errlist are declared through _NETBSD_SOURCE - and above. - HP-UX: sys_nerr, sys_errlist are declared explicitly above. - native Win32: sys_nerr, sys_errlist are declared in . - Cygwin: sys_nerr, sys_errlist are declared in . */ + /* NetBSD: sys_nerr, sys_errlist are declared through _NETBSD_SOURCE + and above. + HP-UX: sys_nerr, sys_errlist are declared explicitly above. + native Windows: sys_nerr, sys_errlist are declared in . + Cygwin: sys_nerr, sys_errlist are declared in . */ if (errnum >= 0 && errnum < sys_nerr) { # if HAVE_CATGETS && (defined __NetBSD__ || defined __hpux) diff --git a/lib/tmpdir.c b/lib/tmpdir.c index b578b1721..6ae7c4284 100644 --- a/lib/tmpdir.c +++ b/lib/tmpdir.c @@ -64,7 +64,7 @@ ISSLASH(C) tests whether C is a directory separator character. */ #if defined _WIN32 || defined __WIN32__ || defined __CYGWIN__ || defined __EMX__ || defined __DJGPP__ - /* Win32, Cygwin, OS/2, DOS */ + /* Native Windows, Cygwin, OS/2, DOS */ # define ISSLASH(C) ((C) == '/' || (C) == '\\') #else /* Unix */ diff --git a/lib/vasnprintf.c b/lib/vasnprintf.c index 3e57c17f9..afbff4fd0 100644 --- a/lib/vasnprintf.c +++ b/lib/vasnprintf.c @@ -4885,7 +4885,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, in format strings in writable memory may crash the program (if compiled with _FORTIFY_SOURCE=2), so we should avoid it in this situation. */ - /* On native Win32 systems (such as mingw), we can avoid using + /* On native Windows systems (such as mingw), we can avoid using %n because: - Although the gl_SNPRINTF_TRUNCATION_C99 test fails, snprintf does not write more than the specified number @@ -4894,7 +4894,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, - Although the gl_SNPRINTF_RETVAL_C99 test fails, snprintf allows us to recognize the case of an insufficient buffer size: it returns -1 in this case. - On native Win32 systems (such as mingw) where the OS is + On native Windows systems (such as mingw) where the OS is Windows Vista, the use of %n in format strings by default crashes the program. See and diff --git a/lib/w32spawn.h b/lib/w32spawn.h index 64e8b2503..0ed8e7ffe 100644 --- a/lib/w32spawn.h +++ b/lib/w32spawn.h @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -/* Get declarations of the Win32 API functions. */ +/* Get declarations of the native Windows API functions. */ #define WIN32_LEAN_AND_MEAN #include @@ -101,7 +101,7 @@ undup_safer_noinherit (int tempfd, int origfd) v.dwPlatformId == VER_PLATFORM_WIN32_NT; }) ? "cmd.exe" : "command.com"). Instead it simply concatenates the arguments, separated by ' ', and calls - CreateProcess(). We must quote the arguments since Win32 CreateProcess() + CreateProcess(). We must quote the arguments since Windows CreateProcess() interprets characters like ' ', '\t', '\\', '"' (but not '<' and '>') in a special way: - Space and tab are interpreted as delimiters. They are not treated as @@ -136,7 +136,7 @@ prepare_spawn (char **argv) script, not a program. On Unix, this would be "/bin/sh". On native Windows, "sh" is actually "sh.exe". We have to omit the directory part and rely on the search in - PATH, because the mingw "mount points" are not visible inside Win32 + PATH, because the mingw "mount points" are not visible inside Windows CreateProcess(). */ *new_argv++ = "sh.exe"; diff --git a/lib/waitpid.c b/lib/waitpid.c index 8078fb958..f2329b7cb 100644 --- a/lib/waitpid.c +++ b/lib/waitpid.c @@ -20,7 +20,7 @@ /* Specification. */ #include -/* Implementation for native Win32 systems. */ +/* Implementation for native Windows systems. */ #include /* for _cwait, WAIT_CHILD */ diff --git a/m4/locale-ar.m4 b/m4/locale-ar.m4 index cc84d3b76..2d2a6c68b 100644 --- a/m4/locale-ar.m4 +++ b/m4/locale-ar.m4 @@ -1,4 +1,4 @@ -# locale-ar.m4 serial 3 +# locale-ar.m4 serial 4 dnl Copyright (C) 2003, 2005-2012 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -26,7 +26,7 @@ char buf[16]; int main () { /* Check whether the given locale name is recognized by the system. */ #if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__ - /* On native Win32, setlocale(category, "") looks at the system settings, + /* On native Windows, setlocale(category, "") looks at the system settings, not at the environment variables. Also, when an encoding suffix such as ".65001" or ".54936" is speficied, it succeeds but sets the LC_CTYPE category of the locale to "C". */ @@ -65,7 +65,7 @@ changequote([,])dnl # "ja" as "Japanese" or "Japanese_Japan.932", # and similar. mingw*) - # Note that on native Win32, the Arabic locale is + # Note that on native Windows, the Arabic locale is # "Arabic_Saudi Arabia.1256", and CP1256 is very different from # ISO-8859-6, so we cannot use it here. gt_cv_locale_ar=none diff --git a/m4/locale-fr.m4 b/m4/locale-fr.m4 index 8450ad443..4cb14b5f5 100644 --- a/m4/locale-fr.m4 +++ b/m4/locale-fr.m4 @@ -1,4 +1,4 @@ -# locale-fr.m4 serial 13 +# locale-fr.m4 serial 14 dnl Copyright (C) 2003, 2005-2012 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -26,7 +26,7 @@ char buf[16]; int main () { /* Check whether the given locale name is recognized by the system. */ #if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__ - /* On native Win32, setlocale(category, "") looks at the system settings, + /* On native Windows, setlocale(category, "") looks at the system settings, not at the environment variables. Also, when an encoding suffix such as ".65001" or ".54936" is speficied, it succeeds but sets the LC_CTYPE category of the locale to "C". */ @@ -80,7 +80,7 @@ changequote([,])dnl # "ja" as "Japanese" or "Japanese_Japan.932", # and similar. mingw*) - # Test for the native Win32 locale name. + # Test for the native Windows locale name. if (LC_ALL=French_France.1252 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then gt_cv_locale_fr=French_France.1252 else @@ -152,7 +152,7 @@ int main () { #if !(defined __BEOS__ || defined __HAIKU__) /* Check whether the given locale name is recognized by the system. */ # if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__ - /* On native Win32, setlocale(category, "") looks at the system settings, + /* On native Windows, setlocale(category, "") looks at the system settings, not at the environment variables. Also, when an encoding suffix such as ".65001" or ".54936" is speficied, it succeeds but sets the LC_CTYPE category of the locale to "C". */ @@ -206,7 +206,7 @@ changequote([,])dnl # "ja" as "Japanese" or "Japanese_Japan.932", # and similar. mingw*) - # Test for the hypothetical native Win32 locale name. + # Test for the hypothetical native Windows locale name. if (LC_ALL=French_France.65001 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then gt_cv_locale_fr_utf8=French_France.65001 else diff --git a/m4/locale-ja.m4 b/m4/locale-ja.m4 index b4c88ab2b..b427f0992 100644 --- a/m4/locale-ja.m4 +++ b/m4/locale-ja.m4 @@ -1,4 +1,4 @@ -# locale-ja.m4 serial 9 +# locale-ja.m4 serial 10 dnl Copyright (C) 2003, 2005-2012 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -28,7 +28,7 @@ int main () const char *p; /* Check whether the given locale name is recognized by the system. */ #if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__ - /* On native Win32, setlocale(category, "") looks at the system settings, + /* On native Windows, setlocale(category, "") looks at the system settings, not at the environment variables. Also, when an encoding suffix such as ".65001" or ".54936" is speficied, it succeeds but sets the LC_CTYPE category of the locale to "C". */ @@ -84,8 +84,9 @@ changequote([,])dnl # "ja" as "Japanese" or "Japanese_Japan.932", # and similar. mingw*) - # Note that on native Win32, the Japanese locale is Japanese_Japan.932, - # and CP932 is very different from EUC-JP, so we cannot use it here. + # Note that on native Windows, the Japanese locale is + # Japanese_Japan.932, and CP932 is very different from EUC-JP, so we + # cannot use it here. gt_cv_locale_ja=none ;; *) diff --git a/m4/locale-tr.m4 b/m4/locale-tr.m4 index f84980844..4bae6a531 100644 --- a/m4/locale-tr.m4 +++ b/m4/locale-tr.m4 @@ -1,4 +1,4 @@ -# locale-tr.m4 serial 7 +# locale-tr.m4 serial 8 dnl Copyright (C) 2003, 2005-2012 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -31,7 +31,7 @@ int main () { program return 1 on BeOS. */ /* Check whether the given locale name is recognized by the system. */ #if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__ - /* On native Win32, setlocale(category, "") looks at the system settings, + /* On native Windows, setlocale(category, "") looks at the system settings, not at the environment variables. Also, when an encoding suffix such as ".65001" or ".54936" is speficied, it succeeds but sets the LC_CTYPE category of the locale to "C". */ @@ -85,7 +85,7 @@ changequote([,])dnl # "ja" as "Japanese" or "Japanese_Japan.932", # and similar. mingw*) - # Test for the hypothetical native Win32 locale name. + # Test for the hypothetical native Windows locale name. if (LC_ALL=Turkish_Turkey.65001 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then gt_cv_locale_tr_utf8=Turkish_Turkey.65001 else diff --git a/m4/locale-zh.m4 b/m4/locale-zh.m4 index 92b78a430..de1a43b30 100644 --- a/m4/locale-zh.m4 +++ b/m4/locale-zh.m4 @@ -1,4 +1,4 @@ -# locale-zh.m4 serial 9 +# locale-zh.m4 serial 10 dnl Copyright (C) 2003, 2005-2012 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -29,7 +29,7 @@ int main () const char *p; /* Check whether the given locale name is recognized by the system. */ #if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__ - /* On native Win32, setlocale(category, "") looks at the system settings, + /* On native Windows, setlocale(category, "") looks at the system settings, not at the environment variables. Also, when an encoding suffix such as ".65001" or ".54936" is speficied, it succeeds but sets the LC_CTYPE category of the locale to "C". */ @@ -85,7 +85,7 @@ changequote([,])dnl # "ja" as "Japanese" or "Japanese_Japan.932", # and similar. mingw*) - # Test for the hypothetical native Win32 locale name. + # Test for the hypothetical native Windows locale name. if (LC_ALL=Chinese_China.54936 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then gt_cv_locale_zh_CN=Chinese_China.54936 else diff --git a/m4/printf.m4 b/m4/printf.m4 index 1962ec8a8..6d1fa5497 100644 --- a/m4/printf.m4 +++ b/m4/printf.m4 @@ -1,4 +1,4 @@ -# printf.m4 serial 46 +# printf.m4 serial 47 dnl Copyright (C) 2003, 2007-2012 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -952,7 +952,7 @@ int main () [ changequote(,)dnl case "$host_os" in - # Guess no only on Solaris, native Win32, and BeOS systems. + # Guess no only on Solaris, native Windows, and BeOS systems. solaris*) gl_cv_func_printf_precision="guessing no" ;; mingw* | pw*) gl_cv_func_printf_precision="guessing no" ;; beos*) gl_cv_func_printf_precision="guessing no" ;; diff --git a/m4/threadlib.m4 b/m4/threadlib.m4 index ed9188a0c..9cedb6700 100644 --- a/m4/threadlib.m4 +++ b/m4/threadlib.m4 @@ -1,4 +1,4 @@ -# threadlib.m4 serial 8 (gettext-0.18.2) +# threadlib.m4 serial 9 (gettext-0.18.2) dnl Copyright (C) 2005-2012 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,7 @@ dnl default is 'no', otherwise it is system dependent. In both cases, the user dnl can change the choice through the options --enable-threads=choice or dnl --disable-threads. dnl Defines at most one of the macros USE_POSIX_THREADS, USE_SOLARIS_THREADS, -dnl USE_PTH_THREADS, USE_WIN32_THREADS +dnl USE_PTH_THREADS, USE_WINDOWS_THREADS dnl Sets the variables LIBTHREAD and LTLIBTHREAD to the linker options for use dnl in a Makefile (LIBTHREAD for use without libtool, LTLIBTHREAD for use with dnl libtool). @@ -53,7 +53,7 @@ AC_DEFUN([gl_THREADLIB_EARLY_BODY], [m4_divert_text([DEFAULTS], [gl_use_threads_default=no])], [m4_divert_text([DEFAULTS], [gl_use_threads_default=])]) AC_ARG_ENABLE([threads], -AC_HELP_STRING([--enable-threads={posix|solaris|pth|win32}], [specify multithreading API])m4_ifdef([gl_THREADLIB_DEFAULT_NO], [], [ +AC_HELP_STRING([--enable-threads={posix|solaris|pth|windows}], [specify multithreading API])m4_ifdef([gl_THREADLIB_DEFAULT_NO], [], [ AC_HELP_STRING([--disable-threads], [build without multithread safety])]), [gl_use_threads=$enableval], [if test -n "$gl_use_threads_default"; then @@ -276,17 +276,19 @@ int main () fi fi if test -z "$gl_have_pthread"; then - if test "$gl_use_threads" = yes || test "$gl_use_threads" = win32; then - if { case "$host_os" in - mingw*) true;; - *) false;; - esac - }; then - gl_threads_api=win32 - AC_DEFINE([USE_WIN32_THREADS], [1], - [Define if the Win32 multithreading API can be used.]) - fi - fi + case "$gl_use_threads" in + yes | windows | win32) # The 'win32' is for backward compatibility. + if { case "$host_os" in + mingw*) true;; + *) false;; + esac + }; then + gl_threads_api=windows + AC_DEFINE([USE_WINDOWS_THREADS], [1], + [Define if the native Windows multithreading API can be used.]) + fi + ;; + esac fi fi AC_MSG_CHECKING([for multithread API to use]) @@ -358,7 +360,7 @@ dnl Cygwin posix -lpthread Y OK dnl dnl Any of the above pth -lpth 0.0 dnl -dnl Mingw win32 N OK +dnl Mingw windows N OK dnl dnl BeOS 5 -- dnl diff --git a/tests/test-cloexec.c b/tests/test-cloexec.c index 415ab2fbb..af14e9c74 100644 --- a/tests/test-cloexec.c +++ b/tests/test-cloexec.c @@ -25,7 +25,7 @@ #include #if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ -/* Get declarations of the Win32 API functions. */ +/* Get declarations of the native Windows API functions. */ # define WIN32_LEAN_AND_MEAN # include /* Get _get_osfhandle. */ @@ -40,7 +40,7 @@ static int is_inheritable (int fd) { #if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ - /* On Win32, the initial state of unassigned standard file + /* On native Windows, the initial state of unassigned standard file descriptors is that they are open but point to an INVALID_HANDLE_VALUE, and there is no fcntl. */ HANDLE h = (HANDLE) _get_osfhandle (fd); diff --git a/tests/test-cond.c b/tests/test-cond.c index 89555d9ee..cbae25d81 100644 --- a/tests/test-cond.c +++ b/tests/test-cond.c @@ -16,7 +16,7 @@ #include -#if USE_POSIX_THREADS || USE_SOLARIS_THREADS || USE_PTH_THREADS || USE_WIN32_THREADS +#if USE_POSIX_THREADS || USE_SOLARIS_THREADS || USE_PTH_THREADS || USE_WINDOWS_THREADS /* Which tests to perform. Uncomment some of these, to verify that all tests crash if no locking diff --git a/tests/test-copy-acl.sh b/tests/test-copy-acl.sh index 4111bbcc2..50112c17e 100755 --- a/tests/test-copy-acl.sh +++ b/tests/test-copy-acl.sh @@ -61,7 +61,7 @@ cd "$builddir" || # manipulating ACLs. # Possible values are: # linux, cygwin, freebsd, solaris, hpux, hpuxjfs, osf1, aix, macosx, irix, none. - # TODO: Support also native Win32 platforms (mingw). + # TODO: Support also native Windows platforms (mingw). acl_flavor=none if (getfacl tmpfile0 >/dev/null) 2>/dev/null; then # Platforms with the getfacl and setfacl programs. diff --git a/tests/test-copy-file.sh b/tests/test-copy-file.sh index fecf9bc30..7d6d687f7 100755 --- a/tests/test-copy-file.sh +++ b/tests/test-copy-file.sh @@ -55,7 +55,7 @@ cd "$builddir" || # manipulating ACLs. # Possible values are: # linux, cygwin, freebsd, solaris, hpux, hpuxjfs, osf1, aix, macosx, irix, none. - # TODO: Support also native Win32 platforms (mingw). + # TODO: Support also native Windows platforms (mingw). acl_flavor=none if (getfacl tmpfile0 >/dev/null) 2>/dev/null; then # Platforms with the getfacl and setfacl programs. diff --git a/tests/test-dup-safer.c b/tests/test-dup-safer.c index 2278b6820..8f4275567 100644 --- a/tests/test-dup-safer.c +++ b/tests/test-dup-safer.c @@ -29,7 +29,7 @@ #include "cloexec.h" #if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ -/* Get declarations of the Win32 API functions. */ +/* Get declarations of the native Windows API functions. */ # define WIN32_LEAN_AND_MEAN # include /* Get _get_osfhandle. */ @@ -56,7 +56,7 @@ static bool is_open (int fd) { #if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ - /* On Win32, the initial state of unassigned standard file + /* On native Windows, the initial state of unassigned standard file descriptors is that they are open but point to an INVALID_HANDLE_VALUE, and there is no fcntl. */ return (HANDLE) _get_osfhandle (fd) != INVALID_HANDLE_VALUE; @@ -73,7 +73,7 @@ static bool is_inheritable (int fd) { #if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ - /* On Win32, the initial state of unassigned standard file + /* On native Windows, the initial state of unassigned standard file descriptors is that they are open but point to an INVALID_HANDLE_VALUE, and there is no fcntl. */ HANDLE h = (HANDLE) _get_osfhandle (fd); diff --git a/tests/test-dup2.c b/tests/test-dup2.c index bf8e5a2dd..5043c0c5b 100644 --- a/tests/test-dup2.c +++ b/tests/test-dup2.c @@ -33,7 +33,7 @@ SIGNATURE_CHECK (dup2, int, (int, int)); #endif #if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ -/* Get declarations of the Win32 API functions. */ +/* Get declarations of the native Windows API functions. */ # define WIN32_LEAN_AND_MEAN # include /* Get _get_osfhandle. */ @@ -47,7 +47,7 @@ static int is_open (int fd) { #if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ - /* On Win32, the initial state of unassigned standard file + /* On native Windows, the initial state of unassigned standard file descriptors is that they are open but point to an INVALID_HANDLE_VALUE, and there is no fcntl. */ return (HANDLE) _get_osfhandle (fd) != INVALID_HANDLE_VALUE; @@ -65,7 +65,7 @@ static int is_inheritable (int fd) { # if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ - /* On Win32, the initial state of unassigned standard file + /* On native Windows, the initial state of unassigned standard file descriptors is that they are open but point to an INVALID_HANDLE_VALUE, and there is no fcntl. */ HANDLE h = (HANDLE) _get_osfhandle (fd); diff --git a/tests/test-dup3.c b/tests/test-dup3.c index dc5c6c2fc..4392f9e3c 100644 --- a/tests/test-dup3.c +++ b/tests/test-dup3.c @@ -29,7 +29,7 @@ SIGNATURE_CHECK (dup3, int, (int, int, int)); #include #if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ -/* Get declarations of the Win32 API functions. */ +/* Get declarations of the native Windows API functions. */ # define WIN32_LEAN_AND_MEAN # include /* Get _get_osfhandle. */ @@ -44,7 +44,7 @@ static bool is_open (int fd) { #if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ - /* On Win32, the initial state of unassigned standard file + /* On native Windows, the initial state of unassigned standard file descriptors is that they are open but point to an INVALID_HANDLE_VALUE, and there is no fcntl. */ return (HANDLE) _get_osfhandle (fd) != INVALID_HANDLE_VALUE; diff --git a/tests/test-fcntl.c b/tests/test-fcntl.c index d29dd602f..78688abfa 100644 --- a/tests/test-fcntl.c +++ b/tests/test-fcntl.c @@ -31,7 +31,7 @@ SIGNATURE_CHECK (fcntl, int, (int, int, ...)); #include #if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ -/* Get declarations of the Win32 API functions. */ +/* Get declarations of the native Windows API functions. */ # define WIN32_LEAN_AND_MEAN # include /* Get _get_osfhandle. */ @@ -51,7 +51,7 @@ static bool is_open (int fd) { #if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ - /* On Win32, the initial state of unassigned standard file + /* On native Windows, the initial state of unassigned standard file descriptors is that they are open but point to an INVALID_HANDLE_VALUE, and there is no fcntl. */ return (HANDLE) _get_osfhandle (fd) != INVALID_HANDLE_VALUE; @@ -68,7 +68,7 @@ static bool is_inheritable (int fd) { #if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ - /* On Win32, the initial state of unassigned standard file + /* On native Windows, the initial state of unassigned standard file descriptors is that they are open but point to an INVALID_HANDLE_VALUE, and there is no fcntl. */ HANDLE h = (HANDLE) _get_osfhandle (fd); diff --git a/tests/test-file-has-acl.sh b/tests/test-file-has-acl.sh index 053246ac9..aa608a1e0 100755 --- a/tests/test-file-has-acl.sh +++ b/tests/test-file-has-acl.sh @@ -61,7 +61,7 @@ cd "$builddir" || # manipulating ACLs. # Possible values are: # linux, cygwin, freebsd, solaris, hpux, hpuxjfs, osf1, aix, macosx, irix, none. - # TODO: Support also native Win32 platforms (mingw). + # TODO: Support also native Windows platforms (mingw). acl_flavor=none if (getfacl tmpfile0 >/dev/null) 2>/dev/null; then # Platforms with the getfacl and setfacl programs. diff --git a/tests/test-lock.c b/tests/test-lock.c index 15851da1c..06bb3df6e 100644 --- a/tests/test-lock.c +++ b/tests/test-lock.c @@ -18,7 +18,7 @@ #include -#if USE_POSIX_THREADS || USE_SOLARIS_THREADS || USE_PTH_THREADS || USE_WIN32_THREADS +#if USE_POSIX_THREADS || USE_SOLARIS_THREADS || USE_PTH_THREADS || USE_WINDOWS_THREADS #if USE_POSIX_THREADS # define TEST_POSIX_THREADS 1 @@ -29,8 +29,8 @@ #if USE_PTH_THREADS # define TEST_PTH_THREADS 1 #endif -#if USE_WIN32_THREADS -# define TEST_WIN32_THREADS 1 +#if USE_WINDOWS_THREADS +# define TEST_WINDOWS_THREADS 1 #endif /* Whether to enable locking. @@ -69,7 +69,7 @@ # undef USE_POSIX_THREADS # undef USE_SOLARIS_THREADS # undef USE_PTH_THREADS -# undef USE_WIN32_THREADS +# undef USE_WINDOWS_THREADS #endif #include "glthread/lock.h" @@ -83,8 +83,8 @@ # if TEST_PTH_THREADS # define USE_PTH_THREADS 1 # endif -# if TEST_WIN32_THREADS -# define USE_WIN32_THREADS 1 +# if TEST_WINDOWS_THREADS +# define USE_WINDOWS_THREADS 1 # endif #endif diff --git a/tests/test-nonblocking-pipe.h b/tests/test-nonblocking-pipe.h index 5bcd6f0ca..37028255c 100644 --- a/tests/test-nonblocking-pipe.h +++ b/tests/test-nonblocking-pipe.h @@ -32,7 +32,7 @@ Solaris <= 7 >= 10241 Solaris >= 8 >= 20481 Cygwin >= 65537 - native Win32 >= 4097 (depends on the _pipe argument) + native Windows >= 4097 (depends on the _pipe argument) */ #if defined __osf__ || (defined __linux__ && (defined __ia64__ || defined __mips__)) # define PIPE_DATA_BLOCK_SIZE 270000 diff --git a/tests/test-nonblocking-socket.h b/tests/test-nonblocking-socket.h index 50af4c8a5..e0fdf9eac 100644 --- a/tests/test-nonblocking-socket.h +++ b/tests/test-nonblocking-socket.h @@ -36,7 +36,7 @@ Solaris 11 2010-11 >= 73729 Cygwin 1.5.x >= 66294401 but then write() fails with ENOBUFS Cygwin 1.7.x >= 163838 (depends on circumstances) - native Win32 >= 66294401 + native Windows >= 66294401 */ #if defined __OpenBSD__ # define SOCKET_DATA_BLOCK_SIZE 100000 @@ -44,7 +44,7 @@ # define SOCKET_DATA_BLOCK_SIZE 1000000 #endif -/* On Linux, MacOS X, Cygwin 1.5.x, native Win32, +/* On Linux, MacOS X, Cygwin 1.5.x, native Windows, sockets have very large buffers in the kernel, so that write() calls succeed before the reader has started reading, even if fd is blocking and the amount of data is larger than 1 MB. */ diff --git a/tests/test-pipe.c b/tests/test-pipe.c index 26c699723..ebee8052d 100644 --- a/tests/test-pipe.c +++ b/tests/test-pipe.c @@ -26,7 +26,7 @@ SIGNATURE_CHECK (pipe, int, (int[2])); #include #if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ -/* Get declarations of the Win32 API functions. */ +/* Get declarations of the native Windows API functions. */ # define WIN32_LEAN_AND_MEAN # include /* Get _get_osfhandle. */ @@ -41,7 +41,7 @@ static bool is_open (int fd) { #if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ - /* On Win32, the initial state of unassigned standard file + /* On native Windows, the initial state of unassigned standard file descriptors is that they are open but point to an INVALID_HANDLE_VALUE, and there is no fcntl. */ return (HANDLE) _get_osfhandle (fd) != INVALID_HANDLE_VALUE; diff --git a/tests/test-pipe2.c b/tests/test-pipe2.c index f75eb4303..93adfd543 100644 --- a/tests/test-pipe2.c +++ b/tests/test-pipe2.c @@ -26,7 +26,7 @@ SIGNATURE_CHECK (pipe2, int, (int[2], int)); #include #if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ -/* Get declarations of the Win32 API functions. */ +/* Get declarations of the native Windows API functions. */ # define WIN32_LEAN_AND_MEAN # include /* Get _get_osfhandle. */ @@ -44,7 +44,7 @@ static bool is_open (int fd) { #if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ - /* On Win32, the initial state of unassigned standard file + /* On native Windows, the initial state of unassigned standard file descriptors is that they are open but point to an INVALID_HANDLE_VALUE, and there is no fcntl. */ return (HANDLE) _get_osfhandle (fd) != INVALID_HANDLE_VALUE; diff --git a/tests/test-poll.c b/tests/test-poll.c index 967da7acb..8738858c9 100644 --- a/tests/test-poll.c +++ b/tests/test-poll.c @@ -37,10 +37,10 @@ SIGNATURE_CHECK (poll, int, (struct pollfd[], nfds_t, int)); #include #if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ -# define WIN32_NATIVE +# define WINDOWS_NATIVE #endif -#ifdef WIN32_NATIVE +#ifdef WINDOWS_NATIVE #include #define pipe(x) _pipe(x, 256, O_BINARY) #endif @@ -132,7 +132,7 @@ connect_to_socket (int blocking) if (!blocking) { -#ifdef WIN32_NATIVE +#ifdef WINDOWS_NATIVE unsigned long iMode = 1; ioctl (s, FIONBIO, (char *) &iMode); @@ -246,7 +246,7 @@ test_connect_first (void) static void test_accept_first (void) { -#ifndef WIN32_NATIVE +#ifndef WINDOWS_NATIVE int s = open_server_socket (); struct sockaddr_in ia; socklen_t addrlen; diff --git a/tests/test-select.h b/tests/test-select.h index 6158402e4..9fe998c1d 100644 --- a/tests/test-select.h +++ b/tests/test-select.h @@ -30,7 +30,7 @@ #include "macros.h" #if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ -# define WIN32_NATIVE +# define WINDOWS_NATIVE #endif #ifdef HAVE_SYS_WAIT_H @@ -121,7 +121,7 @@ connect_to_socket (bool blocking) if (!blocking) { -#ifdef WIN32_NATIVE +#ifdef WINDOWS_NATIVE unsigned long iMode = 1; ioctl (s, FIONBIO, (char *) &iMode); @@ -262,7 +262,7 @@ static void test_bad_fd (select_fn my_select) { /* This tests fails on OSF/1 and native Windows, even with fd = 16. */ -#if !(defined __osf__ || defined WIN32_NATIVE) +#if !(defined __osf__ || defined WINDOWS_NATIVE) int fd; /* On Linux, MacOS X, *BSD, values of fd like 99 or 399 are discarded @@ -318,7 +318,7 @@ test_connect_first (select_fn my_select) static void test_accept_first (select_fn my_select) { -#ifndef WIN32_NATIVE +#ifndef WINDOWS_NATIVE int s = open_server_socket (); struct sockaddr_in ia; socklen_t addrlen; diff --git a/tests/test-set-mode-acl.sh b/tests/test-set-mode-acl.sh index 24ce00302..28d7e110b 100755 --- a/tests/test-set-mode-acl.sh +++ b/tests/test-set-mode-acl.sh @@ -61,7 +61,7 @@ cd "$builddir" || # manipulating ACLs. # Possible values are: # linux, cygwin, freebsd, solaris, hpux, hpuxjfs, osf1, aix, macosx, irix, none. - # TODO: Support also native Win32 platforms (mingw). + # TODO: Support also native Windows platforms (mingw). acl_flavor=none if (getfacl tmpfile0 >/dev/null) 2>/dev/null; then # Platforms with the getfacl and setfacl programs. diff --git a/tests/test-spawn-pipe-child.c b/tests/test-spawn-pipe-child.c index 7e923a741..ee73c83c5 100644 --- a/tests/test-spawn-pipe-child.c +++ b/tests/test-spawn-pipe-child.c @@ -24,7 +24,7 @@ #include #if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ -/* Get declarations of the Win32 API functions. */ +/* Get declarations of the native Windows API functions. */ # define WIN32_LEAN_AND_MEAN # include #endif @@ -55,7 +55,7 @@ static int is_open (int fd) { #if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ - /* On Win32, the initial state of unassigned standard file + /* On native Windows, the initial state of unassigned standard file descriptors is that they are open but point to an INVALID_HANDLE_VALUE, and there is no fcntl. */ return (HANDLE) _get_osfhandle (fd) != INVALID_HANDLE_VALUE; diff --git a/tests/test-thread_create.c b/tests/test-thread_create.c index 8de098bf4..0f86771ea 100644 --- a/tests/test-thread_create.c +++ b/tests/test-thread_create.c @@ -67,7 +67,7 @@ main () } else { -#if USE_POSIX_THREADS || USE_SOLARIS_THREADS || USE_PTH_THREADS || USE_WIN32_THREADS +#if USE_POSIX_THREADS || USE_SOLARIS_THREADS || USE_PTH_THREADS || USE_WINDOWS_THREADS fputs ("glthread_create failed\n", stderr); return 1; #else diff --git a/tests/test-tls.c b/tests/test-tls.c index b644ce2db..84085d756 100644 --- a/tests/test-tls.c +++ b/tests/test-tls.c @@ -18,7 +18,7 @@ #include -#if USE_POSIX_THREADS || USE_SOLARIS_THREADS || USE_PTH_THREADS || USE_WIN32_THREADS +#if USE_POSIX_THREADS || USE_SOLARIS_THREADS || USE_PTH_THREADS || USE_WINDOWS_THREADS #if USE_POSIX_THREADS # define TEST_POSIX_THREADS 1 @@ -29,8 +29,8 @@ #if USE_PTH_THREADS # define TEST_PTH_THREADS 1 #endif -#if USE_WIN32_THREADS -# define TEST_WIN32_THREADS 1 +#if USE_WINDOWS_THREADS +# define TEST_WINDOWS_THREADS 1 #endif /* Whether to help the scheduler through explicit yield(). -- 2.11.0