From 0ada207e2dca2b69a65ce186e625e7f6397edd34 Mon Sep 17 00:00:00 2001 From: Paul Smith Date: Mon, 7 Apr 1997 07:21:16 +0000 Subject: Changes for make 3.75.1 --- w32/subproc/NMakefile | 2 +- w32/subproc/build.bat | 12 ++++++------ w32/subproc/misc.c | 2 +- w32/subproc/sub_proc.c | 12 ++++++------ w32/subproc/w32err.c | 4 ++-- 5 files changed, 16 insertions(+), 16 deletions(-) (limited to 'w32/subproc') 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]; -- cgit v1.2.3