Mercurial > emacs
diff src/process.c @ 96675:d45acf0c8d23
merging Emacs.app (NeXTstep port)
author | Adrian Robert <Adrian.B.Robert@gmail.com> |
---|---|
date | Tue, 15 Jul 2008 18:15:18 +0000 |
parents | 3bea8ede5bd0 |
children | 1e0b67e40d48 |
line wrap: on
line diff
--- a/src/process.c Tue Jul 15 15:45:05 2008 +0000 +++ b/src/process.c Tue Jul 15 18:15:18 2008 +0000 @@ -4877,8 +4877,12 @@ process_output_skip = 0; } #endif - - nfds = select (max (max (max_process_desc, max_keyboard_desc), +#ifdef HAVE_NS + nfds = ns_select +#else + nfds = select +#endif + (max (max (max_process_desc, max_keyboard_desc), max_gpm_desc) + 1, &Available, #ifdef NON_BLOCKING_CONNECT