diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2012-11-24 00:24:11 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2012-11-24 00:24:11 -0800 |
| commit | d4547511735190a81449727a89dc90f6ef1d99a3 (patch) | |
| tree | 21a30d3770b340cfbd67df4875d3c9a1d782bc20 /nt/inc | |
| parent | 0c5ef1333558423f0eb0f14934fffb1b4bce0946 (diff) | |
| download | emacs-d4547511735190a81449727a89dc90f6ef1d99a3.tar.gz | |
Revert recent change for Bug#8855.
As reported by Harald Hanche-Olsen in
<http://lists.gnu.org/archive/html/emacs-devel/2012-11/msg00445.html>
the change introduces a further bug, of creating lots of zombie
processes in some cases. Further work is needed to come up with a
better fix for Bug#8855.
Diffstat (limited to 'nt/inc')
| -rw-r--r-- | nt/inc/ms-w32.h | 3 | ||||
| -rw-r--r-- | nt/inc/sys/wait.h | 33 |
2 files changed, 3 insertions, 33 deletions
diff --git a/nt/inc/ms-w32.h b/nt/inc/ms-w32.h index a9a3049f9b0..dd2ae781cb8 100644 --- a/nt/inc/ms-w32.h +++ b/nt/inc/ms-w32.h @@ -185,12 +185,15 @@ extern char *getenv (); /* Subprocess calls that are emulated. */ #define spawnve sys_spawnve +#define wait sys_wait #define kill sys_kill #define signal sys_signal /* Internal signals. */ #define emacs_raise(sig) emacs_abort() +extern int sys_wait (int *); + /* termcap.c calls that are emulated. */ #define tputs sys_tputs #define tgetstr sys_tgetstr diff --git a/nt/inc/sys/wait.h b/nt/inc/sys/wait.h deleted file mode 100644 index 8d890c9e175..00000000000 --- a/nt/inc/sys/wait.h +++ /dev/null @@ -1,33 +0,0 @@ -/* A limited emulation of sys/wait.h on Posix systems. - -Copyright (C) 2012 Free Software Foundation, Inc. - -This file is part of GNU Emacs. - -GNU Emacs is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -GNU Emacs is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ - -#ifndef INC_SYS_WAIT_H_ -#define INC_SYS_WAIT_H_ - -#define WNOHANG 1 -#define WUNTRACED 2 -#define WSTOPPED 2 /* same as WUNTRACED */ -#define WEXITED 4 -#define WCONTINUED 8 - -/* The various WIF* macros are defined in src/syswait.h. */ - -extern pid_t waitpid (pid_t, int *, int); - -#endif /* INC_SYS_WAIT_H_ */ |