diff options
| author | Kenichi Handa | 2012-10-18 09:00:39 +0900 |
|---|---|---|
| committer | Kenichi Handa | 2012-10-18 09:00:39 +0900 |
| commit | 03d24a8276767e9618d073fa92c3a2c55d6962bf (patch) | |
| tree | 410cf3dc7cc7b8a14d6677065e043c876ef9603b /src/process.c | |
| parent | b278604edf862feced13457cfed15bcf7ac63f76 (diff) | |
| parent | 27067208fd133e8b9530aafe43b0eed13ec08c21 (diff) | |
| download | emacs-03d24a8276767e9618d073fa92c3a2c55d6962bf.tar.gz emacs-03d24a8276767e9618d073fa92c3a2c55d6962bf.zip | |
merge 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) |