diff options
| author | Daniel Colascione | 2012-10-08 00:23:13 -0800 |
|---|---|---|
| committer | Daniel Colascione | 2012-10-08 00:23:13 -0800 |
| commit | 7148eba270e9c521cf6423fdc94b8c86ff604964 (patch) | |
| tree | 2c78c4581a0377e50f3d722d119823c77172067b /src/process.c | |
| parent | 97fbed87597d0b1b93159095170fb296b307d6b0 (diff) | |
| parent | a28a3ae36276ad96cd41c1843d9ae0881390c840 (diff) | |
| download | emacs-7148eba270e9c521cf6423fdc94b8c86ff604964.tar.gz emacs-7148eba270e9c521cf6423fdc94b8c86ff604964.zip | |
Merge cygw32
Diffstat (limited to 'src/process.c')
| -rw-r--r-- | src/process.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/process.c b/src/process.c index 92bea0d3a27..c941a196539 100644 --- a/src/process.c +++ b/src/process.c | |||
| @@ -4646,6 +4646,7 @@ wait_reading_process_output (intmax_t time_limit, int nsecs, int read_kbd, | |||
| 4646 | process_output_skip = 0; | 4646 | process_output_skip = 0; |
| 4647 | } | 4647 | } |
| 4648 | #endif | 4648 | #endif |
| 4649 | |||
| 4649 | #if defined (USE_GTK) || defined (HAVE_GCONF) || defined (HAVE_GSETTINGS) | 4650 | #if defined (USE_GTK) || defined (HAVE_GCONF) || defined (HAVE_GSETTINGS) |
| 4650 | nfds = xg_select | 4651 | nfds = xg_select |
| 4651 | #elif defined (HAVE_NS) | 4652 | #elif defined (HAVE_NS) |