aboutsummaryrefslogtreecommitdiffstats
path: root/src/process.c
diff options
context:
space:
mode:
authorAdrian Robert2008-07-15 18:15:18 +0000
committerAdrian Robert2008-07-15 18:15:18 +0000
commitedfda78355c5528eee489fa8a7f9c73bf8e734f2 (patch)
tree78d2414d9791e1efc17ec9b35b438ae35602340a /src/process.c
parent1391cd548782097e34d7856ec4f20ca90bdf2c26 (diff)
downloademacs-edfda78355c5528eee489fa8a7f9c73bf8e734f2.tar.gz
emacs-edfda78355c5528eee489fa8a7f9c73bf8e734f2.zip
merging Emacs.app (NeXTstep port)
Diffstat (limited to 'src/process.c')
-rw-r--r--src/process.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/process.c b/src/process.c
index c2a20b92db1..87772f34f75 100644
--- a/src/process.c
+++ b/src/process.c
@@ -4877,8 +4877,12 @@ wait_reading_process_output (time_limit, microsecs, read_kbd, do_display,
4877 process_output_skip = 0; 4877 process_output_skip = 0;
4878 } 4878 }
4879#endif 4879#endif
4880 4880#ifdef HAVE_NS
4881 nfds = select (max (max (max_process_desc, max_keyboard_desc), 4881 nfds = ns_select
4882#else
4883 nfds = select
4884#endif
4885 (max (max (max_process_desc, max_keyboard_desc),
4882 max_gpm_desc) + 1, 4886 max_gpm_desc) + 1,
4883 &Available, 4887 &Available,
4884#ifdef NON_BLOCKING_CONNECT 4888#ifdef NON_BLOCKING_CONNECT