aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKaroly Lorentey2003-12-30 17:02:33 +0000
committerKaroly Lorentey2003-12-30 17:02:33 +0000
commitc1c63edb7907e35085f2d61507e1047db85d52c7 (patch)
treec9c8804da129c599228eeb3073eae89cb63581c9
parent096d4be33fc8bd54c363d05fff24f9f029acbf0a (diff)
downloademacs-c1c63edb7907e35085f2d61507e1047db85d52c7.tar.gz
emacs-c1c63edb7907e35085f2d61507e1047db85d52c7.zip
Don't compile sys_select on systems that don't need it.
src/sysdep.c (sys_select): This function is unnecessary on most systems, so #ifdef it out. git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-23
-rw-r--r--README.multi-tty21
-rw-r--r--src/sysdep.c4
2 files changed, 21 insertions, 4 deletions
diff --git a/README.multi-tty b/README.multi-tty
index 391562e4e54..4d225a50c9c 100644
--- a/README.multi-tty
+++ b/README.multi-tty
@@ -213,9 +213,22 @@ DIARY OF CHANGES
213 213
214 (Seems to be working OK.) 214 (Seems to be working OK.)
215 215
216-- Enable select on ttys (sys_select disables the native select on
217 non-X systems). There are some systems (OSS, SCO, maybe cygwin?)
218 that don't support this, so make sure the emulation remains
219 available for them.
220
221 (This was a bogus issue, select is only #defined to be sys_select
222 by sysselect.h if BROKEN_SELECT_NON_X. Fixed sysdep.c to compile
223 sys_select only then.)
224
225
216THINGS TO DO 226THINGS TO DO
217------------ 227------------
218 228
229** Understand Emacs's low-level input system. It seems
230 complicated. :-)
231
219** Fix mysterious memory corruption error with tty deletion. To 232** Fix mysterious memory corruption error with tty deletion. To
220 trigger it, try the following shell command: 233 trigger it, try the following shell command:
221 234
@@ -232,6 +245,9 @@ THINGS TO DO
232 Update: yes it does, although it is much rarer. Or maybe it's 245 Update: yes it does, although it is much rarer. Or maybe it's
233 another bug. 246 another bug.
234 247
248 Update: Some of these errors may have been caused by having more
249 file handles than FD_SETSIZE.
250
235** Make parts of struct tty_output accessible from Lisp. The device 251** Make parts of struct tty_output accessible from Lisp. The device
236 name and the type is sufficient. 252 name and the type is sufficient.
237 253
@@ -264,11 +280,12 @@ THINGS TO DO
264** Find out the best way to support suspending Emacs with multiple 280** Find out the best way to support suspending Emacs with multiple
265 ttys. 281 ttys.
266 282
267** Do tty output through term_hooks, like all other display backends. 283** Do tty output through term_hooks, like graphical display backends.
268 284
269** Fix X support. 285** Fix X support.
270 286
271** Allow simultaneous X and tty frames. 287** Allow simultaneous X and tty frames. (Handling input could be
288 tricky.)
272 289
273** Fix Mac support (I can't do this myself). 290** Fix Mac support (I can't do this myself).
274 291
diff --git a/src/sysdep.c b/src/sysdep.c
index 81299b37516..cc5ef0c5511 100644
--- a/src/sysdep.c
+++ b/src/sysdep.c
@@ -2499,7 +2499,7 @@ select_alarm ()
2499 longjmp (read_alarm_throw, 1); 2499 longjmp (read_alarm_throw, 1);
2500} 2500}
2501 2501
2502#ifndef WINDOWSNT 2502#if (!defined (HAVE_SELECT) || defined (BROKEN_SELECT_NON_X)) && !defined (WINDOWSNT)
2503/* Only rfds are checked. */ 2503/* Only rfds are checked. */
2504int 2504int
2505sys_select (nfds, rfds, wfds, efds, timeout) 2505sys_select (nfds, rfds, wfds, efds, timeout)
@@ -2631,7 +2631,7 @@ sys_select (nfds, rfds, wfds, efds, timeout)
2631 } 2631 }
2632 return ravail; 2632 return ravail;
2633} 2633}
2634#endif /* not WINDOWSNT */ 2634#endif /* (!defined (HAVE_SELECT) || defined (BROKEN_SELECT_NON_X)) && !defined (WINDOWSNT) */
2635 2635
2636/* Read keyboard input into the standard buffer, 2636/* Read keyboard input into the standard buffer,
2637 waiting for at least one character. */ 2637 waiting for at least one character. */