summaryrefslogtreecommitdiff
path: root/libiberty/pex-msdos.c
diff options
context:
space:
mode:
authorKai Tietz <kai.tietz@onevision.com>2009-04-13 10:48:27 +0000
committerKai Tietz <kai.tietz@onevision.com>2009-04-13 10:48:27 +0000
commitbaa72fa0d5ac0f8d080211e32f53a94721756473 (patch)
treee6b5583b82eecce27013b6420c922340e635fc79 /libiberty/pex-msdos.c
parentdb5a5859b593fe205b9cba3a059f55a44d1a2a63 (diff)
downloadgdb-baa72fa0d5ac0f8d080211e32f53a94721756473.tar.gz
Merged from gcc head revision 146001.
2009-04-13 Ozkan Sezer <sezeroz@gmail.com> PR target/39397 * pex-common.h (struct pex_obj): Store pid values as pid_t, not as long (members *children and (*wait)) * pex-common.c (pex_run_in_environment): Likewise. * pex-win32.c (pex_win32_wait): Return pid_t and properly check returned pid value. * pex-djgpp.c (pex_djgpp_wait): Return pid_t. * pex-msdos.c (pex_msdos_wait): Likewise.
Diffstat (limited to 'libiberty/pex-msdos.c')
-rw-r--r--libiberty/pex-msdos.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libiberty/pex-msdos.c b/libiberty/pex-msdos.c
index ab4d736429e..4b77bf655fb 100644
--- a/libiberty/pex-msdos.c
+++ b/libiberty/pex-msdos.c
@@ -59,7 +59,7 @@ static pid_t pex_msdos_exec_child (struct pex_obj *, int, const char *,
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 *, pid_t, int *, struct pex_time *,
+static pid_t pex_msdos_wait (struct pex_obj *, pid_t, int *, struct pex_time *,
int, const char **, int *);
static void pex_msdos_cleanup (struct pex_obj *);
@@ -282,7 +282,7 @@ pex_msdos_exec_child (struct pex_obj *obj, int flags, const char *executable,
has already completed, and we just need to return the exit
status. */
-static int
+static pid_t
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,