Fixes for some Windows/MSC compile issues.

wget command line option seems to have changed?

diff --git a/ChangeLog b/ChangeLog
index bf8bf75..d90e13e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
 
        * make.h: Fix bug in ANSI_STRING/strerror() handling; only define

diff --git a/NEWS b/NEWS
index d8379fa..0bd3779 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,6 @@
 GNU make NEWS                                               -*-indented-text-*-
   History of user-visible changes.
-  26 June 2005
+  27 June 2005
 
 Copyright (C) 2002,2003,2004,2005  Free Software Foundation, Inc.
 See the end for copying conditions.

diff --git a/dir.c b/dir.c
index 832b562..98b3bb1 100644 (file)
--- a/dir.c
+++ b/dir.c
@@ -415,9 +415,9 @@ find_directory (char *name)
   char* w32_path;
   char  fs_label[BUFSIZ];
   char  fs_type[BUFSIZ];
-  long  fs_serno;
-  long  fs_flags;
-  long  fs_len;
+  unsigned long  fs_serno;
+  unsigned long  fs_flags;
+  unsigned long  fs_len;
 #endif
 #ifdef VMS
   if ((*name == '.') && (*(name+1) == 0))

diff --git a/maintMakefile b/maintMakefile
index 00432a7..5e2f5c5 100644 (file)
--- a/maintMakefile
+++ b/maintMakefile
@@ -111,7 +111,7 @@ cvs-clean: maintainer-clean
 ## Updating files.  ##
 ## ---------------- ##
 
-WGET = wget --passive-ftp --non-verbose
+WGET = wget --passive-ftp -nv
 ftp-gnu = ftp://ftp.gnu.org/gnu
 
 move_if_change =  if test -r $(target) && cmp -s $(target).t $(target); then \

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