* src/eval.c (Finteractive_p): Revert lexbind-merge mishap.

[gnu-emacs] / src / systty.h

diff --git a/src/systty.h b/src/systty.h
index ec85818101153e7db4ae0f3c53ad573e678d1dac..b7f36c6c25908df3da1d6502937d36d292685cf3 100644 (file)
--- a/src/systty.h
+++ b/src/systty.h
@@ -1,6 +1,5 @@
 /* systty.h - System-dependent definitions for terminals.
-   Copyright (C) 1993, 1994, 2001, 2002, 2003, 2004,
-                 2005, 2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
+   Copyright (C) 1993-1994, 2001-2012  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -18,10 +17,8 @@ You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* Include the proper files.  */
+
 #ifndef DOS_NT
-#ifndef NO_TERMIO
-#include <termio.h>
-#endif /* not NO_TERMIO */
 #include <termios.h>
 #include <fcntl.h>
 #endif /* not DOS_NT */
@@ -39,20 +36,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include <unistd.h>
 
-\f
-/* Special cases - inhibiting the use of certain features.  */
-
-/* Allow m- file to inhibit use of FIONREAD.  */
-#ifdef BROKEN_FIONREAD
-#undef FIONREAD
-#undef ASYNC
-#endif
-
-/* Interrupt input is not used if there is no FIONREAD.  */
-#ifndef FIONREAD
-#undef SIGIO
-#endif
-
 \f
 /* Try to establish the correct character to disable terminal functions
    in a system-independent manner.  Note that USG (at least) define
@@ -116,6 +99,6 @@ struct emacs_tty {
 #endif /* DOS_NT */
 };
 \f
-extern int emacs_get_tty (int, struct emacs_tty *);
-extern int emacs_set_tty (int, struct emacs_tty *, int);
-
+/* From sysdep.c or w32.c  */
+extern int serial_open (char *);
+extern void serial_configure (struct Lisp_Process *, Lisp_Object);