From 587c6b96efe8a88472fb2f24f09d0e93d60e2242 Mon Sep 17 00:00:00 2001 From: Kai Tietz Date: Mon, 13 Apr 2009 10:48:27 +0000 Subject: Merged from gcc head revision 146001. 2009-04-13 Ozkan Sezer 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. --- libiberty/pex-djgpp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libiberty/pex-djgpp.c') diff --git a/libiberty/pex-djgpp.c b/libiberty/pex-djgpp.c index bd27938..0721139 100644 --- a/libiberty/pex-djgpp.c +++ b/libiberty/pex-djgpp.c @@ -49,7 +49,7 @@ static pid_t pex_djgpp_exec_child (struct pex_obj *, int, const char *, int, int, int, int, const char **, int *); static int pex_djgpp_close (struct pex_obj *, int); -static int pex_djgpp_wait (struct pex_obj *, pid_t, 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. */ @@ -276,7 +276,7 @@ pex_djgpp_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_djgpp_wait (struct pex_obj *obj, pid_t pid, int *status, struct pex_time *time, int done ATTRIBUTE_UNUSED, const char **errmsg ATTRIBUTE_UNUSED, -- cgit v1.1