Mercurial > emacs
changeset 82986:02a346f99eaf
Undo patch-23. I need a coffee.
src/sysdep.c (sys_select): Restore previous #ifdef.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-26
| author | Karoly Lorentey <lorentey@elte.hu> |
|---|---|
| date | Tue, 30 Dec 2003 17:51:52 +0000 |
| parents | 8d7be2534cbc |
| children | 1682917e56b4 |
| files | README.multi-tty src/sysdep.c |
| diffstat | 2 files changed, 6 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/README.multi-tty Tue Dec 30 17:42:02 2003 +0000 +++ b/README.multi-tty Tue Dec 30 17:51:52 2003 +0000 @@ -213,16 +213,6 @@ (Seems to be working OK.) --- Enable select on ttys (sys_select disables the native select on - non-X systems). There are some systems (OSS, SCO, maybe cygwin?) - that don't support this, so make sure the emulation remains - available for them. - - (This was a bogus issue, select is only #defined to be sys_select - by sysselect.h if BROKEN_SELECT_NON_X. Fixed sysdep.c to compile - sys_select only then.) - - THINGS TO DO ------------ @@ -236,16 +226,16 @@ Emacs usually dumps core after a few dozen iterations. (The bug seems to be related to the xfree()ing or bzero()ing of - tty_output.Wcm or some other tty_output part. Maybe there are - outside references to struct Wcm? Why were these vars collected - into a struct before multi-tty support?) + tty_output.Wcm. Maybe there are outside references to struct Wcm? + Why were these vars collected into a struct before multi-tty + support?) The bug does not seem to happen if the error occurs before terminal initialization or if I comment out all xfree()s in delete_frame. Update: yes it does, although it is much rarer. Or maybe it's another bug. - Update: Some of these errors may have been caused by having more + Idea: Some of these errors may have been caused by having more file handles than FD_SETSIZE. ** Find out why does Emacs abort when it wants to close its
--- a/src/sysdep.c Tue Dec 30 17:42:02 2003 +0000 +++ b/src/sysdep.c Tue Dec 30 17:51:52 2003 +0000 @@ -2499,7 +2499,7 @@ longjmp (read_alarm_throw, 1); } -#if (!defined (HAVE_SELECT) || defined (BROKEN_SELECT_NON_X)) && !defined (WINDOWSNT) +#ifndef WINDOWSNT /* Only rfds are checked. */ int sys_select (nfds, rfds, wfds, efds, timeout) @@ -2631,7 +2631,7 @@ } return ravail; } -#endif /* (!defined (HAVE_SELECT) || defined (BROKEN_SELECT_NON_X)) && !defined (WINDOWSNT) */ +#endif not WINDOWSNT /* Read keyboard input into the standard buffer, waiting for at least one character. */