Mercurial > hg > octave-lojdl > gnulib-hg

comparison lib/progreloc.c @ 16214:ec738d6aeef5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 <https://lists.gnu.org/archive/html/bug-gnulib/2012-01/msg00027.html>. Suggested by Paul Eggert.
author Bruno Haible <bruno@clisp.org>
date Wed, 04 Jan 2012 14:31:33 +0100
parents 8250f2777afc
children 59c686e5b2df
comparison
equal deleted inserted replaced
16213:64bc9fe46ccd 16214:ec738d6aeef5
34 #if HAVE_MACH_O_DYLD_H 34 #if HAVE_MACH_O_DYLD_H
35 # include <mach-o/dyld.h> 35 # include <mach-o/dyld.h>
36 #endif 36 #endif
37 37
38 #if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__ 38 #if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__
39 # define WIN32_NATIVE 39 # define WINDOWS_NATIVE
40 #endif 40 #endif
41 41
42 #ifdef WIN32_NATIVE 42 #ifdef WINDOWS_NATIVE
43 # define WIN32_LEAN_AND_MEAN 43 # define WIN32_LEAN_AND_MEAN
44 # include <windows.h> 44 # include <windows.h>
45 #endif 45 #endif
46 46
47 #include "relocatable.h" 47 #include "relocatable.h"
72 /* Pathname support. 72 /* Pathname support.
73 ISSLASH(C) tests whether C is a directory separator character. 73 ISSLASH(C) tests whether C is a directory separator character.
74 IS_PATH_WITH_DIR(P) tests whether P contains a directory specification. 74 IS_PATH_WITH_DIR(P) tests whether P contains a directory specification.
75 */ 75 */
76 #if ((defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__) || defined __EMX__ || defined __DJGPP__ 76 #if ((defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__) || defined __EMX__ || defined __DJGPP__
77 /* Win32, OS/2, DOS */ 77 /* Native Windows, OS/2, DOS */
78 # define ISSLASH(C) ((C) == '/' || (C) == '\\') 78 # define ISSLASH(C) ((C) == '/' || (C) == '\\')
79 # define HAS_DEVICE(P) \ 79 # define HAS_DEVICE(P) \
80 ((((P)[0] >= 'A' && (P)[0] <= 'Z') || ((P)[0] >= 'a' && (P)[0] <= 'z')) \ 80 ((((P)[0] >= 'A' && (P)[0] <= 'Z') || ((P)[0] >= 'a' && (P)[0] <= 'z')) \
81 && (P)[1] == ':') 81 && (P)[1] == ':')
82 # define IS_PATH_WITH_DIR(P) \ 82 # define IS_PATH_WITH_DIR(P) \
111 /* Tests whether a given pathname may belong to the executable. */ 111 /* Tests whether a given pathname may belong to the executable. */
112 static bool 112 static bool
113 maybe_executable (const char *filename) 113 maybe_executable (const char *filename)
114 { 114 {
115 /* Woe32 lacks the access() function. */ 115 /* Woe32 lacks the access() function. */
116 #if !defined WIN32_NATIVE 116 #if !defined WINDOWS_NATIVE
117 if (access (filename, X_OK) < 0) 117 if (access (filename, X_OK) < 0)
118 return false; 118 return false;
119 #endif 119 #endif
120 120
121 #if defined __linux__ || defined __CYGWIN__ 121 #if defined __linux__ || defined __CYGWIN__
146 Guaranteed to work on Linux and Woe32. Likely to work on the other 146 Guaranteed to work on Linux and Woe32. Likely to work on the other
147 Unixes (maybe except BeOS), under most conditions. */ 147 Unixes (maybe except BeOS), under most conditions. */
148 static char * 148 static char *
149 find_executable (const char *argv0) 149 find_executable (const char *argv0)
150 { 150 {
151 #if defined WIN32_NATIVE 151 #if defined WINDOWS_NATIVE
152 /* Native Win32 only. 152 /* Native Windows only.
153 On Cygwin, it is better to use the Cygwin provided /proc interface, than 153 On Cygwin, it is better to use the Cygwin provided /proc interface, than
154 to use native Win32 API and cygwin_conv_to_posix_path, because it supports 154 to use native Windows API and cygwin_conv_to_posix_path, because it
155 longer file names 155 supports longer file names
156 (see <http://cygwin.com/ml/cygwin/2011-01/msg00410.html>). */ 156 (see <http://cygwin.com/ml/cygwin/2011-01/msg00410.html>). */
157 char location[MAX_PATH]; 157 char location[MAX_PATH];
158 int length = GetModuleFileName (NULL, location, sizeof (location)); 158 int length = GetModuleFileName (NULL, location, sizeof (location));
159 if (length < 0) 159 if (length < 0)
160 return NULL; 160 return NULL;