diff options
| author | Eli Zaretskii | 2012-10-17 23:07:59 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2012-10-17 23:07:59 +0200 |
| commit | 8cd879af4a393715c1c7f44a174248e85f7810ab (patch) | |
| tree | f0779e2a9c855ccba82628f6bcda43ef0d800ff3 /src/process.c | |
| parent | 37a4dabe8aaa51e15cf63e43710ee4b8f35d434b (diff) | |
| parent | a68089e4a4dd41c9b838d82d1d96d971b01398c8 (diff) | |
| download | emacs-8cd879af4a393715c1c7f44a174248e85f7810ab.tar.gz emacs-8cd879af4a393715c1c7f44a174248e85f7810ab.zip | |
Merge from trunk.
Diffstat (limited to 'src/process.c')
| -rw-r--r-- | src/process.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/process.c b/src/process.c index d45a2c6e8e0..307e82819d6 100644 --- a/src/process.c +++ b/src/process.c | |||
| @@ -125,6 +125,11 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 125 | #include "xgselect.h" | 125 | #include "xgselect.h" |
| 126 | #endif | 126 | #endif |
| 127 | 127 | ||
| 128 | #ifdef WINDOWSNT | ||
| 129 | extern int sys_select (int, SELECT_TYPE *, SELECT_TYPE *, SELECT_TYPE *, | ||
| 130 | EMACS_TIME *, void *); | ||
| 131 | #endif | ||
| 132 | |||
| 128 | #ifndef WNOHANG | 133 | #ifndef WNOHANG |
| 129 | # undef waitpid | 134 | # undef waitpid |
| 130 | # define waitpid(pid, status, options) wait (status) | 135 | # define waitpid(pid, status, options) wait (status) |