github-repos/make
1
0
Fork 0
mirror of https://github.com/mirror/make.git synced 2025-03-27 20:40:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for some Windows/MSC compile issues.

Browse Source 
wget command line option seems to have changed?
This commit is contained in:
Paul Smith 2005-06-27 15:40:56 +00:00
parent a36cfed31a
commit b581e1350f
5 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
2005-06-27 Paul D. Smith <psmith@gnu.org>
* dir.c (find_directory): Change type of fs_serno/fs_flags/fs_len
to unsigned long. Fixes Savannah bug #13550.
* w32/subproc/sub_proc.c: Remove (HANDLE) casts on lvalues.
(process_pipe_io): Initialize tStdin/tStdout/tStderr variables.
Fixes Savannah bug #13551.
2005-06-26 Paul D. Smith <psmith@gnu.org> 2005-06-26 Paul D. Smith <psmith@gnu.org>
* make.h: Fix bug in ANSI_STRING/strerror() handling; only define * make.h: Fix bug in ANSI_STRING/strerror() handling; only define

2
NEWS
View File

@ -1,6 +1,6 @@
GNU make NEWS -*-indented-text-*- GNU make NEWS -*-indented-text-*-
History of user-visible changes. History of user-visible changes.
26 June 2005 27 June 2005
Copyright (C) 2002,2003,2004,2005 Free Software Foundation, Inc. Copyright (C) 2002,2003,2004,2005 Free Software Foundation, Inc.
See the end for copying conditions. See the end for copying conditions.

6
dir.c
View File

@ -415,9 +415,9 @@ find_directory (char *name)
char* w32_path; char* w32_path;
char fs_label[BUFSIZ]; char fs_label[BUFSIZ];
char fs_type[BUFSIZ]; char fs_type[BUFSIZ];
long fs_serno; unsigned long fs_serno;
long fs_flags; unsigned long fs_flags;
long fs_len; unsigned long fs_len;
#endif #endif
#ifdef VMS #ifdef VMS
if ((*name == '.') && (*(name+1) == 0)) if ((*name == '.') && (*(name+1) == 0))

2
maintMakefile
View File

@ -111,7 +111,7 @@ cvs-clean: maintainer-clean
## Updating files. ## ## Updating files. ##
## ---------------- ## ## ---------------- ##
WGET = wget --passive-ftp --non-verbose WGET = wget --passive-ftp -nv
ftp-gnu = ftp://ftp.gnu.org/gnu ftp-gnu = ftp://ftp.gnu.org/gnu
move_if_change = if test -r $(target) && cmp -s $(target).t $(target); then \ move_if_change = if test -r $(target) && cmp -s $(target).t $(target); then \

16
w32/subproc/sub_proc.c
View File

@ -536,15 +536,15 @@ process_begin(
/* Close the halves of the pipes we don't need */ /* Close the halves of the pipes we don't need */
if (pproc->sv_stdin) { if (pproc->sv_stdin) {
CloseHandle((HANDLE)pproc->sv_stdin[1]); CloseHandle((HANDLE)pproc->sv_stdin[1]);
(HANDLE)pproc->sv_stdin[1] = 0; pproc->sv_stdin[1] = 0;
} }
if (pproc->sv_stdout) { if (pproc->sv_stdout) {
CloseHandle((HANDLE)pproc->sv_stdout[1]); CloseHandle((HANDLE)pproc->sv_stdout[1]);
(HANDLE)pproc->sv_stdout[1] = 0; pproc->sv_stdout[1] = 0;
} }
if (pproc->sv_stderr) { if (pproc->sv_stderr) {
CloseHandle((HANDLE)pproc->sv_stderr[1]); CloseHandle((HANDLE)pproc->sv_stderr[1]);
(HANDLE)pproc->sv_stderr[1] = 0; pproc->sv_stderr[1] = 0;
} }
free( command_line ); free( command_line );
@ -657,7 +657,7 @@ process_pipe_io(
sub_process *pproc = (sub_process *)proc; sub_process *pproc = (sub_process *)proc;
bool_t stdin_eof = FALSE, stdout_eof = FALSE, stderr_eof = FALSE; bool_t stdin_eof = FALSE, stdout_eof = FALSE, stderr_eof = FALSE;
HANDLE childhand = (HANDLE) pproc->pid; HANDLE childhand = (HANDLE) pproc->pid;
HANDLE tStdin, tStdout, tStderr; HANDLE tStdin = NULL, tStdout = NULL, tStderr = NULL;
DWORD dwStdin, dwStdout, dwStderr; DWORD dwStdin, dwStdout, dwStderr;
HANDLE wait_list[4]; HANDLE wait_list[4];
DWORD wait_count; DWORD wait_count;
@ -674,7 +674,7 @@ process_pipe_io(
if (!pproc->inp) { if (!pproc->inp) {
stdin_eof = TRUE; stdin_eof = TRUE;
CloseHandle((HANDLE)pproc->sv_stdin[0]); CloseHandle((HANDLE)pproc->sv_stdin[0]);
(HANDLE)pproc->sv_stdin[0] = 0; pproc->sv_stdin[0] = 0;
} else { } else {
tStdin = (HANDLE) _beginthreadex( 0, 1024, tStdin = (HANDLE) _beginthreadex( 0, 1024,
(unsigned (__stdcall *) (void *))proc_stdin_thread, pproc, 0, (unsigned (__stdcall *) (void *))proc_stdin_thread, pproc, 0,
@ -739,7 +739,7 @@ process_pipe_io(
if (ready_hand == tStdin) { if (ready_hand == tStdin) {
CloseHandle((HANDLE)pproc->sv_stdin[0]); CloseHandle((HANDLE)pproc->sv_stdin[0]);
(HANDLE)pproc->sv_stdin[0] = 0; pproc->sv_stdin[0] = 0;
CloseHandle(tStdin); CloseHandle(tStdin);
tStdin = 0; tStdin = 0;
stdin_eof = TRUE; stdin_eof = TRUE;
@ -747,7 +747,7 @@ process_pipe_io(
} else if (ready_hand == tStdout) { } else if (ready_hand == tStdout) {
CloseHandle((HANDLE)pproc->sv_stdout[0]); CloseHandle((HANDLE)pproc->sv_stdout[0]);
(HANDLE)pproc->sv_stdout[0] = 0; pproc->sv_stdout[0] = 0;
CloseHandle(tStdout); CloseHandle(tStdout);
tStdout = 0; tStdout = 0;
stdout_eof = TRUE; stdout_eof = TRUE;
@ -755,7 +755,7 @@ process_pipe_io(
} else if (ready_hand == tStderr) { } else if (ready_hand == tStderr) {
CloseHandle((HANDLE)pproc->sv_stderr[0]); CloseHandle((HANDLE)pproc->sv_stderr[0]);
(HANDLE)pproc->sv_stderr[0] = 0; pproc->sv_stderr[0] = 0;
CloseHandle(tStderr); CloseHandle(tStderr);
tStderr = 0; tStderr = 0;
stderr_eof = TRUE; stderr_eof = TRUE;