Imported binutils-2.20

[msp430-binutils.git] / libiberty / pex-djgpp.c

diff --git a/libiberty/pex-djgpp.c b/libiberty/pex-djgpp.c
index ac5a4f97ba76a33681bb6aef991f3a1d20aecb5e..0721139954ff993a0c872a5697b4d9c8bdba9eeb 100644 (file)
--- a/libiberty/pex-djgpp.c
+++ b/libiberty/pex-djgpp.c
@@ -44,12 +44,12 @@ extern int errno;
 
 static int pex_djgpp_open_read (struct pex_obj *, const char *, int);
 static int pex_djgpp_open_write (struct pex_obj *, const char *, int);
-static long pex_djgpp_exec_child (struct pex_obj *, int, const char *,
+static pid_t pex_djgpp_exec_child (struct pex_obj *, int, const char *,
                                  char * const *, char * const *,
                                  int, int, int, int,
                                  const char **, int *);
 static int pex_djgpp_close (struct pex_obj *, int);
-static int pex_djgpp_wait (struct pex_obj *, long, int *, struct pex_time *,
+static pid_t pex_djgpp_wait (struct pex_obj *, pid_t, int *, struct pex_time *,
                           int, const char **, int *);
 
 /* The list of functions we pass to the common routines.  */
@@ -110,7 +110,7 @@ pex_djgpp_close (struct pex_obj *obj ATTRIBUTE_UNUSED, int fd)
 
 /* Execute a child.  */
 
-static long
+static pid_t
 pex_djgpp_exec_child (struct pex_obj *obj, int flags, const char *executable,
                      char * const * argv, char * const * env,
                       int in, int out, int errdes,
@@ -132,19 +132,19 @@ pex_djgpp_exec_child (struct pex_obj *obj, int flags, const char *executable,
        {
          *err = errno;
          *errmsg = "dup";
-         return -1;
+         return (pid_t) -1;
        }
       if (dup2 (in, STDIN_FILE_NO) < 0)
        {
          *err = errno;
          *errmsg = "dup2";
-         return -1;
+         return (pid_t) -1;
        }
       if (close (in) < 0)
        {
          *err = errno;
          *errmsg = "close";
-         return -1;
+         return (pid_t) -1;
        }
     }
 
@@ -155,19 +155,19 @@ pex_djgpp_exec_child (struct pex_obj *obj, int flags, const char *executable,
        {
          *err = errno;
          *errmsg = "dup";
-         return -1;
+         return (pid_t) -1;
        }
       if (dup2 (out, STDOUT_FILE_NO) < 0)
        {
          *err = errno;
          *errmsg = "dup2";
-         return -1;
+         return (pid_t) -1;
        }
       if (close (out) < 0)
        {
          *err = errno;
          *errmsg = "close";
-         return -1;
+         return (pid_t) -1;
        }
     }
 
@@ -179,14 +179,14 @@ pex_djgpp_exec_child (struct pex_obj *obj, int flags, const char *executable,
        {
          *err = errno;
          *errmsg = "dup";
-         return -1;
+         return (pid_t) -1;
        }
       if (dup2 ((flags & PEX_STDERR_TO_STDOUT) != 0 ? STDOUT_FILE_NO : errdes,
                 STDERR_FILE_NO) < 0)
        {
          *err = errno;
          *errmsg = "dup2";
-         return -1;
+         return (pid_t) -1;
        }
       if (errdes != STDERR_FILE_NO)
        {
@@ -194,7 +194,7 @@ pex_djgpp_exec_child (struct pex_obj *obj, int flags, const char *executable,
            {
              *err = errno;
              *errmsg = "close";
-             return -1;
+             return (pid_t) -1;
            }
        }
     }
@@ -218,13 +218,13 @@ pex_djgpp_exec_child (struct pex_obj *obj, int flags, const char *executable,
        {
          *err = errno;
          *errmsg = "dup2";
-         return -1;
+         return (pid_t) -1;
        }
       if (close (org_in) < 0)
        {
          *err = errno;
          *errmsg = "close";
-         return -1;
+         return (pid_t) -1;
        }
     }
 
@@ -234,13 +234,13 @@ pex_djgpp_exec_child (struct pex_obj *obj, int flags, const char *executable,
        {
          *err = errno;
          *errmsg = "dup2";
-         return -1;
+         return (pid_t) -1;
        }
       if (close (org_out) < 0)
        {
          *err = errno;
          *errmsg = "close";
-         return -1;
+         return (pid_t) -1;
        }
     }
 
@@ -251,13 +251,13 @@ pex_djgpp_exec_child (struct pex_obj *obj, int flags, const char *executable,
        {
          *err = errno;
          *errmsg = "dup2";
-         return -1;
+         return (pid_t) -1;
        }
       if (close (org_errdes) < 0)
        {
          *err = errno;
          *errmsg = "close";
-         return -1;
+         return (pid_t) -1;
        }
     }
 
@@ -269,15 +269,15 @@ pex_djgpp_exec_child (struct pex_obj *obj, int flags, const char *executable,
   statuses[obj->count] = status;
   obj->sysdep = (void *) statuses;
 
-  return obj->count;
+  return (pid_t) obj->count;
 }
 
 /* Wait for a child process to complete.  Actually the child process
    has already completed, and we just need to return the exit
    status.  */
 
-static int
-pex_djgpp_wait (struct pex_obj *obj, long pid, int *status,
+static pid_t
+pex_djgpp_wait (struct pex_obj *obj, pid_t pid, int *status,
                struct pex_time *time, int done ATTRIBUTE_UNUSED,
                const char **errmsg ATTRIBUTE_UNUSED,
                int *err ATTRIBUTE_UNUSED)