merge from gcc

2 files changed, 14 insertions, 6 deletions

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 770ef95..f26593f 100644
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,4 +1,11 @@
-2003-07-02  Danny Smith  <dannysmith@users.source.forge.net>
+2003-07-05  Danny Smith  <dannysmith@users.sourceforge.net>
+
+	* pex-win32.c (pexecute): Mark parameters this_pname and
+	temp_base as unused. Remove unused variables retries,
+	sleep_interval. Initialize org_stdin, org_stdout.
+	(pwait): Mark parameter flags as unused.
+
+2003-07-02  Danny Smith  <dannysmith@users.sourceforge.net>
 
 	* pex-win32.c (fix_argv): Ensure that the executable pathname
 	uses Win32 backslashes.
diff --git a/libiberty/pex-win32.c b/libiberty/pex-win32.c
index 24a55e8..27a5bb4 100644
--- a/libiberty/pex-win32.c
+++ b/libiberty/pex-win32.c
@@ -136,15 +136,16 @@ int
 pexecute (program, argv, this_pname, temp_base, errmsg_fmt, errmsg_arg, flags)
      const char *program;
      char * const *argv;
-     const char *this_pname;
-     const char *temp_base;
+     const char *this_pname ATTRIBUTE_UNUSED;
+     const char *temp_base ATTRIBUTE_UNUSED;
      char **errmsg_fmt, **errmsg_arg;
      int flags;
 {
   int pid;
-  int pdes[2], org_stdin, org_stdout;
+  int pdes[2];
+  int org_stdin = -1;
+  int org_stdout = -1;
   int input_desc, output_desc;
-  int retries, sleep_interval;
 
   /* Pipe waiting from last process, to be used as input for the next one.
      Value is STDIN_FILE_NO if no pipe is waiting
@@ -227,7 +228,7 @@ int
 pwait (pid, status, flags)
      int pid;
      int *status;
-     int flags;
+     int flags ATTRIBUTE_UNUSED;
 {
   int termstat;