diff options
| author | DJ Delorie <dj@redhat.com> | 2007-08-24 16:08:40 +0000 |
|---|---|---|
| committer | DJ Delorie <dj@redhat.com> | 2007-08-24 16:08:40 +0000 |
| commit | 29d89e071e7c7d0ea3b13eb883e44498d8390aa0 (patch) | |
| tree | bbe2c03a11530a05013ec0c145af8653e36e05c9 /libiberty/pex-msdos.c | |
| parent | 59678365bc23c47485f4333b685ed0b902340af0 (diff) | |
| download | gdb-29d89e071e7c7d0ea3b13eb883e44498d8390aa0.zip gdb-29d89e071e7c7d0ea3b13eb883e44498d8390aa0.tar.gz gdb-29d89e071e7c7d0ea3b13eb883e44498d8390aa0.tar.bz2 | |
merge from gcc
Diffstat (limited to 'libiberty/pex-msdos.c')
| -rw-r--r-- | libiberty/pex-msdos.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libiberty/pex-msdos.c b/libiberty/pex-msdos.c index b5acd86..ab4d736 100644 --- a/libiberty/pex-msdos.c +++ b/libiberty/pex-msdos.c @@ -54,12 +54,12 @@ struct pex_msdos static int pex_msdos_open (struct pex_obj *, const char *, int); static int pex_msdos_open (struct pex_obj *, const char *, int); static int pex_msdos_fdindex (struct pex_msdos *, int); -static long pex_msdos_exec_child (struct pex_obj *, int, const char *, +static pid_t pex_msdos_exec_child (struct pex_obj *, int, const char *, char * const *, char * const *, int, int, int, int, int, const char **, int *); static int pex_msdos_close (struct pex_obj *, int); -static int pex_msdos_wait (struct pex_obj *, long, int *, struct pex_time *, +static int pex_msdos_wait (struct pex_obj *, pid_t, int *, struct pex_time *, int, const char **, int *); static void pex_msdos_cleanup (struct pex_obj *); @@ -152,7 +152,7 @@ pex_msdos_close (struct pex_obj *obj, int fd) /* Execute a child. */ -static long +static pid_t pex_msdos_exec_child (struct pex_obj *obj, int flags, const char *executable, char * const * argv, char * const * env, int in, int out, int toclose ATTRIBUTE_UNUSED, @@ -235,7 +235,7 @@ pex_msdos_exec_child (struct pex_obj *obj, int flags, const char *executable, free (scmd); free (rf); *errmsg = "cannot open temporary command file"; - return -1; + return (pid_t) -1; } for (i = 1; argv[i] != NULL; ++i) @@ -262,7 +262,7 @@ pex_msdos_exec_child (struct pex_obj *obj, int flags, const char *executable, free (scmd); free (rf); *errmsg = "system"; - return -1; + return (pid_t) -1; } remove (rf); @@ -275,7 +275,7 @@ pex_msdos_exec_child (struct pex_obj *obj, int flags, const char *executable, ms->statuses = XRESIZEVEC(int, ms->statuses, obj->count + 1); ms->statuses[obj->count] = status; - return obj->count; + return (pid_t) obj->count; } /* Wait for a child process to complete. Actually the child process @@ -283,7 +283,7 @@ pex_msdos_exec_child (struct pex_obj *obj, int flags, const char *executable, status. */ static int -pex_msdos_wait (struct pex_obj *obj, long pid, int *status, +pex_msdos_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) |