From 9d9f18127ffc1bc26358a5d48917ef4e4bafbddc Mon Sep 17 00:00:00 2001 From: Karoly Lorentey Date: Tue, 30 Dec 2003 17:51:52 +0000 Subject: [PATCH] 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 --- README.multi-tty | 18 ++++-------------- src/sysdep.c | 4 ++-- 2 files changed, 6 insertions(+), 16 deletions(-) diff --git a/README.multi-tty b/README.multi-tty index 0a938a555ad..862a287fb9e 100644 --- a/README.multi-tty +++ b/README.multi-tty @@ -213,16 +213,6 @@ DIARY OF CHANGES (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 @@ THINGS TO DO 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 diff --git a/src/sysdep.c b/src/sysdep.c index cc5ef0c5511..b3a46c77eb3 100644 --- a/src/sysdep.c +++ b/src/sysdep.c @@ -2499,7 +2499,7 @@ select_alarm () 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 @@ sys_select (nfds, rfds, wfds, efds, timeout) } 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. */