summaryrefslogtreecommitdiff
path: root/libiberty/pexecute.c
diff options
context:
space:
mode:
authorlaw <law@138bc75d-0d04-0410-961f-82ee72b054a4>1998-12-04 01:21:00 +0000
committerlaw <law@138bc75d-0d04-0410-961f-82ee72b054a4>1998-12-04 01:21:00 +0000
commita5c560422f1011e30176e7c7fb899766bb852ac7 (patch)
tree854bd72199ea00774193e3c87820ed95e92f8db2 /libiberty/pexecute.c
parenta340215589bceba139367066c349de12c8d0d297 (diff)
downloadgcc-a5c560422f1011e30176e7c7fb899766bb852ac7.tar.gz
* pexecute.c: Remove obsolete ifdefed cygwin code.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@24084 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libiberty/pexecute.c')
-rw-r--r--libiberty/pexecute.c42
1 files changed, 5 insertions, 37 deletions
diff --git a/libiberty/pexecute.c b/libiberty/pexecute.c
index fde411c92b2..206db58ee81 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