diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-09-20 13:35:30 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-09-20 13:35:30 +0000 |
| commit | c84fa0f60948766003c3fe9322682f5ed55347f9 (patch) | |
| tree | e9d4fc3fc03d88d3a108dca516e4a36a03857f12 /dmake/unix | |
| parent | b3af662c10a45673d3a0dc9d1ee01dd2707ad0f5 (diff) | |
INTEGRATION: CWS os2port01 (1.9.12); FILE MERGED
2007/08/08 08:43:38 obr 1.9.12.2: RESYNC: (1.9-1.11); FILE MERGED
2006/12/28 14:54:34 ydario 1.9.12.1: OS/2 initial import.
Diffstat (limited to 'dmake/unix')
| -rw-r--r-- | dmake/unix/runargv.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/dmake/unix/runargv.c b/dmake/unix/runargv.c index 3714e8b107a2..d1231e10b1f9 100644 --- a/dmake/unix/runargv.c +++ b/dmake/unix/runargv.c @@ -1,6 +1,6 @@ /* $RCSfile: runargv.c,v $ --- $Revision: 1.11 $ --- last change: $Author: vg $ $Date: 2007-01-18 09:44:15 $ +-- $Revision: 1.12 $ +-- last change: $Author: vg $ $Date: 2007-09-20 14:35:30 $ -- -- SYNOPSIS -- Invoke a sub process. @@ -128,6 +128,11 @@ _finished_child(pid, ?) [unix/runargv] handles the finished child. If there # include <process.h> #endif +#ifdef __EMX__ +# include <process.h> +#define _P_NOWAIT P_NOWAIT +#endif + #include "sysintf.h" #if HAVE_ERRNO_H # include <errno.h> @@ -308,7 +313,7 @@ char *cmd; argv = Pack_argv( group, shell, cmd ); /* Really spawn or fork a child. */ -#if ENABLE_SPAWN && ( HAVE_SPAWN_H || __CYGWIN__ ) +#if ENABLE_SPAWN && ( HAVE_SPAWN_H || __CYGWIN__ || __EMX__) /* As no other childs are started while the output is redirected this * is save. */ if( Is_exec_shell ) { @@ -325,7 +330,7 @@ char *cmd; dup2( zerofd, 1 ); } } -#if __CYGWIN__ +#if defined( __CYGWIN__) || defined( __EMX__) pid = spawnvp(_P_NOWAIT, argv[0], (const char**) argv); #else /* __CYGWIN__ */ if (posix_spawnp (&pid, argv[0], NULL, NULL, argv, (char *)NULL)) |