# HG changeset patch
# User Dan Nicolaescu <dann@ics.uci.edu>
# Date 1275966161 25200
# Node ID 734073f5d07300548089215454a8d96186dd9537
# Parent  38cf1b719b59a25197116175beb614d856420f8a
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.

diff -r 38cf1b719b59 -r 734073f5d073 src/ChangeLog
--- a/src/ChangeLog	Mon Jun 07 19:29:12 2010 -0700
+++ b/src/ChangeLog	Mon Jun 07 20:02:41 2010 -0700
@@ -1,3 +1,12 @@
+2010-06-08  Dan Nicolaescu  <dann@ics.uci.edu>
+
+	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.
+
 2010-06-07  Martin Rudalics  <rudalics@gmx.at>
 
 	* window.c (Fselect_window): Move `record_buffer' up to the
diff -r 38cf1b719b59 -r 734073f5d073 src/alloc.c
--- a/src/alloc.c	Mon Jun 07 19:29:12 2010 -0700
+++ b/src/alloc.c	Mon Jun 07 20:02:41 2010 -0700
@@ -70,7 +70,6 @@
 #endif
 
 #ifdef HAVE_FCNTL_H
-#define INCLUDED_FCNTL
 #include <fcntl.h>
 #endif
 #ifndef O_WRONLY
diff -r 38cf1b719b59 -r 734073f5d073 src/callproc.c
--- a/src/callproc.c	Mon Jun 07 19:29:12 2010 -0700
+++ b/src/callproc.c	Mon Jun 07 20:02:41 2010 -0700
@@ -39,7 +39,6 @@
 
 #include <sys/file.h>
 #ifdef HAVE_FCNTL_H
-#define INCLUDED_FCNTL
 #include <fcntl.h>
 #endif
 
@@ -53,7 +52,6 @@
 #endif
 
 #ifdef MSDOS	/* Demacs 1.1.1 91/10/16 HIRANO Satoshi */
-#define INCLUDED_FCNTL
 #include <fcntl.h>
 #include <sys/stat.h>
 #include <sys/param.h>
diff -r 38cf1b719b59 -r 734073f5d073 src/systty.h
--- 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.  */
diff -r 38cf1b719b59 -r 734073f5d073 src/xterm.c
--- a/src/xterm.c	Mon Jun 07 19:29:12 2010 -0700
+++ b/src/xterm.c	Mon Jun 07 20:02:41 2010 -0700
@@ -56,9 +56,7 @@
 
 #include "systime.h"
 
-#ifndef INCLUDED_FCNTL
 #include <fcntl.h>
-#endif
 #include <ctype.h>
 #include <errno.h>
 #include <setjmp.h>