Changes for make 3.75.1

11 files changed, 52 insertions, 52 deletions

diff --git a/w32/compat/dirent.c b/w32/compat/dirent.c
index 25a7b74..9416828 100644
--- a/w32/compat/dirent.c
+++ b/w32/compat/dirent.c
@@ -78,7 +78,7 @@ closedir(DIR *pDir)
 		return;

 	}

 

-	/* close the WIN32 directory handle */

+	/* close the WINDOWS32 directory handle */

 	if (pDir->dir_hDirHandle != INVALID_HANDLE_VALUE)

 		FindClose(pDir->dir_hDirHandle);

 

@@ -90,7 +90,7 @@ closedir(DIR *pDir)
 struct dirent *

 readdir(DIR* pDir)

 {

-	WIN32_FIND_DATA wfdFindData;

+	WINDOWS32_FIND_DATA wfdFindData;

 

 	if (!pDir) {

 		errno = EINVAL;

@@ -134,7 +134,7 @@ rewinddir(DIR* pDir)
 		return;

 	}

 

-	/* close the WIN32 directory handle */

+	/* close the WINDOWS32 directory handle */

 	if (pDir->dir_hDirHandle != INVALID_HANDLE_VALUE)

 		if (!FindClose(pDir->dir_hDirHandle))

 			errno = EBADF;

diff --git a/w32/include/dirent.h b/w32/include/dirent.h
index ccc1800..3437bd0 100644
--- a/w32/include/dirent.h
+++ b/w32/include/dirent.h
@@ -15,7 +15,7 @@
 

 struct dirent

 {

-  ino_t d_ino; 			/* unused - no equivalent on WIN32 */

+  ino_t d_ino; 			/* unused - no equivalent on WINDOWS32 */

   char d_name[NAME_MAX+1];

 };

 

diff --git a/w32/include/pathstuff.h b/w32/include/pathstuff.h
index 5916961..a036f7b 100644
--- a/w32/include/pathstuff.h
+++ b/w32/include/pathstuff.h
@@ -1,8 +1,8 @@
 #ifndef _PATHSTUFF_H
 #define _PATHSTUFF_H
 
-extern char * convert_Path_to_win32(char *Path, char to_delim);
-extern char * convert_vpath_to_win32(char *Path, char to_delim);
+extern char * convert_Path_to_windows32(char *Path, char to_delim);
+extern char * convert_vpath_to_windows32(char *Path, char to_delim);
 extern char * w32ify(char *file, int resolve);
 extern char * getcwd_fs(char *buf, int len);
 
diff --git a/w32/include/sub_proc.h b/w32/include/sub_proc.h
index 4f1f312..700b945 100644
--- a/w32/include/sub_proc.h
+++ b/w32/include/sub_proc.h
@@ -20,7 +20,7 @@
 

 /* $Id$ */

 

-#ifdef WIN32

+#ifdef WINDOWS32

 

 #define EXTERN_DECL(entry, args) extern entry args

 #define VOID_DECL void

diff --git a/w32/include/w32err.h b/w32/include/w32err.h
index b48dbbe..68a6590 100644
--- a/w32/include/w32err.h
+++ b/w32/include/w32err.h
@@ -5,6 +5,6 @@
 #define EXTERN_DECL(entry, args) entry args

 #endif

 

-EXTERN_DECL(char * map_win32_error_to_string, (DWORD error));

+EXTERN_DECL(char * map_windows32_error_to_string, (DWORD error));

 

 #endif /* !_W32ERR_H */

diff --git a/w32/pathstuff.c b/w32/pathstuff.c
index ee4a7f0..01ed52f 100644
--- a/w32/pathstuff.c
+++ b/w32/pathstuff.c
@@ -4,10 +4,10 @@
 #include "pathstuff.h"
 
 /*
- * Convert delimiter separated vpath to Canonical format. 
+ * Convert delimiter separated vpath to Canonical format.
  */
 char *
-convert_vpath_to_win32(char *Path, char to_delim)
+convert_vpath_to_windows32(char *Path, char to_delim)
 {
     char *etok;            /* token separator for old Path */
 
@@ -19,21 +19,21 @@ convert_vpath_to_win32(char *Path, char to_delim)
 		if (isblank(*etok))
 			*etok = to_delim;
 
-	return (convert_Path_to_win32(Path, to_delim));
+	return (convert_Path_to_windows32(Path, to_delim));
 }
 
 /*
- * Convert delimiter separated path to Canonical format. 
+ * Convert delimiter separated path to Canonical format.
  */
 char *
-convert_Path_to_win32(char *Path, char to_delim)
+convert_Path_to_windows32(char *Path, char to_delim)
 {
     char *etok;            /* token separator for old Path */
     char *p;            /* points to element of old Path */
 
     /* is this a multi-element Path ? */
     for (p = Path, etok = strpbrk(p, ":;");
-         etok; 
+         etok;
          etok = strpbrk(p, ":;"))
         if ((etok - p) == 1) {
             if (*(etok - 1) == ';' ||
@@ -48,7 +48,7 @@ convert_Path_to_win32(char *Path, char to_delim)
                 p = ++etok;
             } else
                 /* all finished, force abort */
-                p += strlen(p);    
+                p += strlen(p);
         } else {
             /* found another one, no drive letter */
             *etok = to_delim;
@@ -61,7 +61,7 @@ convert_Path_to_win32(char *Path, char to_delim)
 	*p = '\\';
 #endif
     return Path;
-} 
+}
 
 /*
  * Convert to forward slashes. Resolve to full pathname optionally
@@ -100,10 +100,10 @@ getcwd_fs(char* buf, int len)
 #ifdef unused
 /*
  * Convert delimiter separated pathnames (e.g. PATH) or single file pathname
- * (e.g. c:/foo, c:\bar) to NutC format. If we are handed a string that 
- * _NutPathToNutc() fails to convert, just return the path we were handed 
- * and assume the caller will know what to do with it (It was probably 
- * a mistake to try and convert it anyway due to some of the bizarre things 
+ * (e.g. c:/foo, c:\bar) to NutC format. If we are handed a string that
+ * _NutPathToNutc() fails to convert, just return the path we were handed
+ * and assume the caller will know what to do with it (It was probably
+ * a mistake to try and convert it anyway due to some of the bizarre things
  * that might look like pathnames in makefiles).
  */
 char *
@@ -119,8 +119,8 @@ convert_path_to_nutc(char *path)
     char *rval;
 
     /* is this a multi-element path ? */
-    for (p = path, etok = strpbrk(p, ":;"), count = 0; 
-         etok; 
+    for (p = path, etok = strpbrk(p, ":;"), count = 0;
+         etok;
          etok = strpbrk(p, ":;"))
         if ((etok - p) == 1) {
             if (*(etok - 1) == ';' ||
@@ -132,15 +132,15 @@ convert_path_to_nutc(char *path)
                 p = ++etok, count++;
             else
                 /* all finished, force abort */
-                p += strlen(p);    
-        } else 
+                p += strlen(p);
+        } else
             /* found another one, no drive letter */
             p = ++etok, count++;
 
     if (count) {
         count++;    /* x1;x2;x3 <- need to count x3 */
 
-        /* 
+        /*
          * Hazard a guess on how big the buffer needs to be.
          * We have to convert things like c:/foo to /c=/foo.
          */
@@ -154,10 +154,10 @@ convert_path_to_nutc(char *path)
          * a time. Single file pathnames will fail this and fall
          * to the logic below loop.
          */
-        for (p = path, etok = strpbrk(p, ":;"); 
-             etok; 
+        for (p = path, etok = strpbrk(p, ":;");
+             etok;
              etok = strpbrk(p, ":;")) {
-    
+
             /* don't trip up on device specifiers or empty path slots */
             if ((etok - p) == 1)
                 if (*(etok - 1) == ';' ||
@@ -165,14 +165,14 @@ convert_path_to_nutc(char *path)
                     p = ++etok;
                     continue;
                 } else if ((etok = strpbrk(etok+1, ":;")) == NULL)
-                    break;    /* thing found was a WIN32 pathname */
+                    break;    /* thing found was a WINDOWS32 pathname */
 
             /* save separator */
             sep = *etok;
 
             /* terminate the current path element -- temporarily */
             *etok = '\0';
-    
+
 #ifdef __NUTC__
             /* convert to NutC format */
             if (_NutPathToNutc(p, pathp, 0) == FALSE) {
@@ -187,20 +187,20 @@ convert_path_to_nutc(char *path)
             *pathp++ = '/';
             strcpy(pathp, &p[2]);
 #endif
-            
+
             pathp += strlen(pathp);
             *pathp++ = ':';     /* use Unix style path separtor for new path */
             *pathp   = '\0'; /* make sure we are null terminaed */
-    
+
             /* restore path separator */
             *etok = sep;
-    
+
             /* point p to first char of next path element */
             p = ++etok;
 
         }
     } else {
-        nutc_path_len = strlen(path) + 3; 
+        nutc_path_len = strlen(path) + 3;
         nutc_path = xmalloc(nutc_path_len);
         pathp = nutc_path;
         *pathp = '\0';
@@ -211,7 +211,7 @@ convert_path_to_nutc(char *path)
       * OK, here we handle the last element in PATH (e.g. c of a;b;c)
      * or the path was a single filename and will be converted
      * here. Note, testing p here assures that we don't trip up
-     * on paths like a;b; which have trailing delimiter followed by 
+     * on paths like a;b; which have trailing delimiter followed by
      * nothing.
      */
     if (*p != '\0') {
@@ -234,6 +234,6 @@ convert_path_to_nutc(char *path)
     rval = savestring(nutc_path, strlen(nutc_path));
     free(nutc_path);
     return rval;
-} 
+}
 
 #endif
diff --git a/w32/subproc/NMakefile b/w32/subproc/NMakefile
index 0d2ca89..2843a82 100644
--- a/w32/subproc/NMakefile
+++ b/w32/subproc/NMakefile
@@ -27,7 +27,7 @@ CC = cl
 OUTDIR=.

 MAKEFILE=NMakefile

 

-CFLAGS_any = /nologo /MT /W3 /GX /Z7 /YX /D WIN32 /D _WINDOWS  -I. -I../include

+CFLAGS_any = /nologo /MT /W3 /GX /Z7 /YX /D WINDOWS32 /D _WINDOWS  -I. -I../include

 CFLAGS_debug = $(CFLAGS_any) /Od /D _DEBUG /FR.\WinDebug\ /Fp.\WinDebug\subproc.pch /Fo.\WinDebug/

 CFLAGS_release = $(CFLAGS_any) /O2 /FR.\WinRel\ /Fp.\WinRel\subproc.pch /Fo.\WinRel/

 

diff --git a/w32/subproc/build.bat b/w32/subproc/build.bat
index bb35615..3c53a43 100644
--- a/w32/subproc/build.bat
+++ b/w32/subproc/build.bat
@@ -1,10 +1,10 @@
 if not exist .\WinDebug\nul mkdir .\WinDebug

-cl.exe /nologo /MT /W3 /GX /Z7 /YX /Od /I .. /I . /I ../include /D WIN32 /D _DEBUG /D _WINDOWS /FR.\WinDebug/ /Fp.\WinDebug/subproc.pch /Fo.\WinDebug/ /c misc.c

-cl.exe /nologo /MT /W3 /GX /Z7 /YX /Od /I .. /I . /I ../include /D WIN32 /D _DEBUG /D _WINDOWS /FR.\WinDebug/ /Fp.\WinDebug/subproc.pch /Fo.\WinDebug/ /c sub_proc.c

-cl.exe /nologo /MT /W3 /GX /Z7 /YX /Od /I .. /I . /I ../include /D WIN32 /D _DEBUG /D _WINDOWS /FR.\WinDebug/ /Fp.\WinDebug/subproc.pch /Fo.\WinDebug/ /c w32err.c

+cl.exe /nologo /MT /W3 /GX /Z7 /YX /Od /I .. /I . /I ../include /D WINDOWS32 /D _DEBUG /D _WINDOWS /FR.\WinDebug/ /Fp.\WinDebug/subproc.pch /Fo.\WinDebug/ /c misc.c

+cl.exe /nologo /MT /W3 /GX /Z7 /YX /Od /I .. /I . /I ../include /D WINDOWS32 /D _DEBUG /D _WINDOWS /FR.\WinDebug/ /Fp.\WinDebug/subproc.pch /Fo.\WinDebug/ /c sub_proc.c

+cl.exe /nologo /MT /W3 /GX /Z7 /YX /Od /I .. /I . /I ../include /D WINDOWS32 /D _DEBUG /D _WINDOWS /FR.\WinDebug/ /Fp.\WinDebug/subproc.pch /Fo.\WinDebug/ /c w32err.c

 lib.exe /NOLOGO /OUT:.\WinDebug\subproc.lib  .\WinDebug/misc.obj  .\WinDebug/sub_proc.obj  .\WinDebug/w32err.obj

 if not exist .\WinRel\nul mkdir .\WinRel

-cl.exe /nologo /MT /W3 /GX /YX /O2 /I ../include /D WIN32 /D NDEBUG /D _WINDOWS /FR.\WinRel/ /Fp.\WinRel/subproc.pch /Fo.\WinRel/ /c misc.c

-cl.exe /nologo /MT /W3 /GX /YX /O2 /I ../include /D WIN32 /D NDEBUG /D _WINDOWS /FR.\WinRel/ /Fp.\WinRel/subproc.pch /Fo.\WinRel/ /c sub_proc.c

-cl.exe /nologo /MT /W3 /GX /YX /O2 /I ../include /D WIN32 /D NDEBUG /D _WINDOWS /FR.\WinRel/ /Fp.\WinRel/subproc.pch /Fo.\WinRel/ /c w32err.c

+cl.exe /nologo /MT /W3 /GX /YX /O2 /I ../include /D WINDOWS32 /D NDEBUG /D _WINDOWS /FR.\WinRel/ /Fp.\WinRel/subproc.pch /Fo.\WinRel/ /c misc.c

+cl.exe /nologo /MT /W3 /GX /YX /O2 /I ../include /D WINDOWS32 /D NDEBUG /D _WINDOWS /FR.\WinRel/ /Fp.\WinRel/subproc.pch /Fo.\WinRel/ /c sub_proc.c

+cl.exe /nologo /MT /W3 /GX /YX /O2 /I ../include /D WINDOWS32 /D NDEBUG /D _WINDOWS /FR.\WinRel/ /Fp.\WinRel/subproc.pch /Fo.\WinRel/ /c w32err.c

 lib.exe /NOLOGO /OUT:.\WinRel\subproc.lib  .\WinRel/misc.obj  .\WinRel/sub_proc.obj  .\WinRel/w32err.obj

diff --git a/w32/subproc/misc.c b/w32/subproc/misc.c
index 2fd66ab..4e1b0c7 100644
--- a/w32/subproc/misc.c
+++ b/w32/subproc/misc.c
@@ -7,7 +7,7 @@
 

 /*

  * Description:  Convert a NULL string terminated UNIX environment block to

- *		an environment block suitable for a win32 system call

+ *		an environment block suitable for a windows32 system call

  *

  * Returns:  TRUE= success, FALSE=fail

  *

diff --git a/w32/subproc/sub_proc.c b/w32/subproc/sub_proc.c
index 4f1ded9..55aafec 100644
--- a/w32/subproc/sub_proc.c
+++ b/w32/subproc/sub_proc.c
@@ -395,7 +395,7 @@ process_begin(
 	exec_handle = find_file(exec_path, &file_info);

 

 	/*

-	 * If we couldn't open the file, just assume that Win32 will be able

+	 * If we couldn't open the file, just assume that Windows32 will be able

 	 * to find and execute it.

 	 */

 	if (exec_handle == (HANDLE)HFILE_ERROR) {

@@ -578,7 +578,7 @@ proc_stdout_thread(sub_process *pproc)
 	for (;;) {

 		if (ReadFile( (HANDLE)pproc->sv_stdout[0], &c, 1, &nread, NULL) 

 					== FALSE) {

-/*			map_win32_error_to_string(GetLastError());*/

+/*			map_windows32_error_to_string(GetLastError());*/

 			_endthreadex(0);

 		}

 		if (nread == 0)

@@ -609,7 +609,7 @@ proc_stderr_thread(sub_process *pproc)
 

 	for (;;) {

 		if (ReadFile( (HANDLE)pproc->sv_stderr[0], &c, 1, &nread, NULL) == FALSE) {

-			map_win32_error_to_string(GetLastError());

+			map_windows32_error_to_string(GetLastError());

 			_endthreadex(0);

 		}

 		if (nread == 0)

@@ -718,7 +718,7 @@ process_pipe_io(
 			 	one second to collect all remaining output */

 		

 		if (wait_return == WAIT_FAILED) {

-/*			map_win32_error_to_string(GetLastError());*/

+/*			map_windows32_error_to_string(GetLastError());*/

 			pproc->last_err = GetLastError();

 			pproc->lerrno = E_SCALL;

 			goto done;

@@ -835,7 +835,7 @@ process_file_io(
 	wait_return = WaitForSingleObject(childhand, INFINITE);

 		

 	if (wait_return != WAIT_OBJECT_0) {

-/*		map_win32_error_to_string(GetLastError());*/

+/*		map_windows32_error_to_string(GetLastError());*/

 		pproc->last_err = GetLastError();

 		pproc->lerrno = E_SCALL;

 		goto done2;

@@ -883,7 +883,7 @@ process_cleanup(
 

 

 /*

- * Try to protect against WIN32 argument munging. This function takes

+ * Try to protect against WINDOWS32 argument munging. This function takes

  * an argv vector and outputs a 'protected' string as a return

  * value. The return code can be safely passed to CreateProcess().

  *

diff --git a/w32/subproc/w32err.c b/w32/subproc/w32err.c
index 8abd75b..afe7668 100644
--- a/w32/subproc/w32err.c
+++ b/w32/subproc/w32err.c
@@ -2,7 +2,7 @@
 #include "w32err.h"

 

 /*

- * Description: the win32 version of perror()

+ * Description: the windows32 version of perror()

  *

  * Returns:  a pointer to a static error

  *

@@ -10,7 +10,7 @@
  *      comp.os.ms-windows.programmer.win32

  */

 char * 

-map_win32_error_to_string (DWORD ercode) {

+map_windows32_error_to_string (DWORD ercode) {

 /* __declspec (thread) necessary if you will use multiple threads */

 __declspec (thread) static char szMessageBuffer[128];