Mercurial > emacs
comparison 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 |
comparison
equal
deleted
inserted
replaced
| 96674:ff312a846b25 | 96675:d45acf0c8d23 |
|---|---|
| 4875 } | 4875 } |
| 4876 EMACS_SET_SECS_USECS (timeout, 0, usecs); | 4876 EMACS_SET_SECS_USECS (timeout, 0, usecs); |
| 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 |
| 4885 (check_connect ? &Connecting : (SELECT_TYPE *)0), | 4889 (check_connect ? &Connecting : (SELECT_TYPE *)0), |
| 4886 #else | 4890 #else |