From e31cacdcd39e09cf6730e963e998e4582b3edae8 Mon Sep 17 00:00:00 2001 From: DJ Delorie Date: Thu, 1 Jun 2006 14:57:50 +0000 Subject: merge from gcc --- libiberty/pex-msdos.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'libiberty/pex-msdos.c') diff --git a/libiberty/pex-msdos.c b/libiberty/pex-msdos.c index db22337aa2a..bcad93dbe26 100644 --- a/libiberty/pex-msdos.c +++ b/libiberty/pex-msdos.c @@ -55,8 +55,8 @@ 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 *, - char * const *, int, int, int, - const char **, int *); + char * const *, char * const *, + 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 *, int, const char **, int *); @@ -153,7 +153,7 @@ pex_msdos_close (struct pex_obj *obj, int fd) static long pex_msdos_exec_child (struct pex_obj *obj, int flags, const char *executable, - char * const * argv, int in, int out, + char * const * argv, char * const * env, int in, int out, int errdes ATTRIBUTE_UNUSED, const char **errmsg, int *err) { -- cgit v1.2.1