summaryrefslogtreecommitdiff
path: root/libiberty/pexecute.c
diff options
context:
space:
mode:
authorlaw <law@138bc75d-0d04-0410-961f-82ee72b054a4>1999-03-11 00:32:50 +0000
committerlaw <law@138bc75d-0d04-0410-961f-82ee72b054a4>1999-03-11 00:32:50 +0000
commitd267f7786322e879d9c34740045f04ce4da1a0af (patch)
tree9e755a7e7b51b72419d838a49ea0db815d62dc60 /libiberty/pexecute.c
parent26a1dadb40724379019d45c0f0a4470b6a09c2c1 (diff)
downloadgcc-d267f7786322e879d9c34740045f04ce4da1a0af.tar.gz
* pexecute.c (__CYGWIN32__): Rename to
(__CYGWIN__): this. * xmalloc.c: Likewise. Changes to support i386-pc-uwin. * configure.in (*-*-uwin*): Workaround for vfork bug. * configure: Regenerate. * pexecute.c (pexecute): Be like standard Unix. (pwait): Likewise. * xmalloc.c (first_break): Define. (xmalloc_set_program_name): Use. (xmalloc): Use. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@25694 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libiberty/pexecute.c')
-rw-r--r--libiberty/pexecute.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/libiberty/pexecute.c b/libiberty/pexecute.c
index 0ead5669acd..49d04a88407 100644
--- a/libiberty/pexecute.c
+++ b/libiberty/pexecute.c
@@ -230,18 +230,18 @@ pwait (pid, status, flags)
#endif /* MSDOS */
-#if defined (_WIN32)
+#if defined (_WIN32) && ! defined (__UWIN__)
#include <process.h>
-#ifdef __CYGWIN32__
+#ifdef __CYGWIN__
#define fix_argv(argvec) (argvec)
extern int _spawnv ();
extern int _spawnvp ();
-#else /* ! __CYGWIN32__ */
+#else /* ! __CYGWIN__ */
/* This is a kludge to get around the Microsoft C spawn functions' propensity
to remove the outermost set of double quotes from all arguments. */
@@ -279,7 +279,7 @@ fix_argv (argvec)
return (const char * const *) argvec;
}
-#endif /* __CYGWIN32__ */
+#endif /* __CYGWIN__ */
#include <io.h>
#include <fcntl.h>
@@ -396,7 +396,7 @@ pwait (pid, status, flags)
int *status;
int flags;
{
-#ifdef __CYGWIN32__
+#ifdef __CYGWIN__
return wait (status);
#else
int termstat;
@@ -416,10 +416,10 @@ pwait (pid, status, flags)
*status = (((termstat) & 0xff) << 8);
return pid;
-#endif /* __CYGWIN32__ */
+#endif /* __CYGWIN__ */
}
-#endif /* _WIN32 */
+#endif /* _WIN32 && ! __UWIN__ */
#ifdef OS2
@@ -602,7 +602,7 @@ pfinish ()
/* include for Unix-like environments but not for Dos-like environments */
#if ! defined (__MSDOS__) && ! defined (OS2) && ! defined (MPW) \
- && ! defined (_WIN32)
+ && ! (defined (_WIN32) && ! defined (__UWIN__))
extern int execv ();
extern int execvp ();
@@ -731,4 +731,4 @@ pwait (pid, status, flags)
return pid;
}
-#endif /* ! __MSDOS__ && ! OS2 && ! MPW && ! _WIN32 */
+#endif /* ! __MSDOS__ && ! OS2 && ! MPW && ! (_WIN32 && ! __UWIN__) */