diff src/systty.h @ 108908:734073f5d073

Remove INCLUDED_FCNTL. * xterm.c (INCLUDED_FCNTL): * callproc.c (INCLUDED_FCNTL): * alloc.c (INCLUDED_FCNTL): * systty.h (INCLUDED_FCNTL): Remove all uses, not needed anymore. (emacs_get_tty, emacs_set_tty): Declare unconditionally.

--- a/src/systty.h	Mon Jun 07 19:29:12 2010 -0700
+++ b/src/systty.h	Mon Jun 07 20:02:41 2010 -0700
@@ -27,17 +27,13 @@
 #ifndef NO_TERMIO
 #include <termio.h>
 #endif /* not NO_TERMIO */
-#ifndef INCLUDED_FCNTL
-#define INCLUDED_FCNTL
 #include <fcntl.h>
-#endif
 #else /* not HAVE_TERMIO */
 #ifdef HAVE_TERMIOS
 #ifndef NO_TERMIO
 #include <termio.h>
 #endif
 #include <termios.h>
-#define INCLUDED_FCNTL
 #include <fcntl.h>
 #else /* neither HAVE_TERMIO nor HAVE_TERMIOS */
 #ifndef DOS_NT
@@ -247,10 +243,8 @@
    expression, so we moved them out to their own functions in sysdep.c.  */
 #define EMACS_GET_TTY(fd, p)        (emacs_get_tty ((fd), (p)))
 #define EMACS_SET_TTY(fd, p, waitp) (emacs_set_tty ((fd), (p), (waitp)))
-#ifdef P_  /* Unfortunately this file is sometimes included before lisp.h */
-extern int emacs_get_tty P_ ((int, struct emacs_tty *));
-extern int emacs_set_tty P_ ((int, struct emacs_tty *, int));
-#endif
+extern int emacs_get_tty (int, struct emacs_tty *);
+extern int emacs_set_tty (int, struct emacs_tty *, int);
 
 
 /* Define EMACS_TTY_TABS_OK.  */