diff options
| author | Christopher Faylor <cgf@cygnus.com> | 1998-12-04 01:21:00 +0000 |
|---|---|---|
| committer | Jeff Law <law@gcc.gnu.org> | 1998-12-03 18:21:00 -0700 |
| commit | 8d525fa8a7d9a221591a1a165597b372cfc1ff0a (patch) | |
| tree | 854bd72199ea00774193e3c87820ed95e92f8db2 /libiberty | |
| parent | 36e77ea6ff00d6043d1b195683a6b98ef6eb7aeb (diff) | |
| download | gcc-8d525fa8a7d9a221591a1a165597b372cfc1ff0a.zip gcc-8d525fa8a7d9a221591a1a165597b372cfc1ff0a.tar.gz gcc-8d525fa8a7d9a221591a1a165597b372cfc1ff0a.tar.bz2 | |
* pexecute.c: Remove obsolete ifdefed cygwin code.
From-SVN: r24084
Diffstat (limited to 'libiberty')
| -rw-r--r-- | libiberty/ChangeLog | 4 | ||||
| -rw-r--r-- | libiberty/pexecute.c | 42 |
2 files changed, 9 insertions, 37 deletions
diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog index dba5a95..0aca2ef 100644 --- a/libiberty/ChangeLog +++ b/libiberty/ChangeLog @@ -1,3 +1,7 @@ +Sat Nov 28 17:25:22 1998 Christopher Faylor <cgf@cygnus.com> + + * pexecute.c: Remove obsolete ifdefed cygwin code. + Fri Nov 27 13:26:06 1998 Kaveh R. Ghazi <ghazi@caip.rutgers.edu> * choose-temp.c: Always include libiberty.h. Avoid redundancies. diff --git a/libiberty/pexecute.c b/libiberty/pexecute.c index fde411c..206db58 100644 --- a/libiberty/pexecute.c +++ b/libiberty/pexecute.c @@ -244,41 +244,6 @@ pwait (pid, status, flags) extern int _spawnv (); extern int _spawnvp (); -int -pexecute (program, argv, this_pname, temp_base, errmsg_fmt, errmsg_arg, flags) - const char *program; - char * const *argv; - const char *this_pname; - const char *temp_base; - char **errmsg_fmt, **errmsg_arg; - int flags; -{ - int pid; - - if ((flags & PEXECUTE_ONE) != PEXECUTE_ONE) - abort (); - pid = (flags & PEXECUTE_SEARCH ? _spawnvp : _spawnv) - (_P_NOWAIT, program, fix_argv(argv)); - if (pid == -1) - { - *errmsg_fmt = install_error_msg; - *errmsg_arg = program; - return -1; - } - return pid; -} - -int -pwait (pid, status, flags) - int pid; - int *status; - int flags; -{ - /* ??? Here's an opportunity to canonicalize the values in STATUS. - Needed? */ - return cwait (status, pid, WAIT_CHILD); -} - #else /* ! __CYGWIN32__ */ /* This is a kludge to get around the Microsoft C spawn functions' propensity @@ -317,6 +282,7 @@ fix_argv (argvec) return (const char * const *) argvec; } +#endif /* __CYGWIN32__ */ #include <io.h> #include <fcntl.h> @@ -433,6 +399,9 @@ pwait (pid, status, flags) int *status; int flags; { +#ifdef __CYGWIN32__ + return wait (status); +#else int termstat; pid = _cwait (&termstat, pid, WAIT_CHILD); @@ -450,10 +419,9 @@ pwait (pid, status, flags) *status = (((termstat) & 0xff) << 8); return pid; +#endif /* __CYGWIN32__ */ } -#endif /* ! defined (__CYGWIN32__) */ - #endif /* _WIN32 */ #ifdef OS2 |