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 --git a/src/ChangeLog b/src/ChangeLog
index d899077..2290a51 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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 --git a/src/alloc.c b/src/alloc.c
index c1f1094..e0f07cc 100644 (file)
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -70,7 +70,6 @@ extern POINTER_TYPE *sbrk ();
 #endif
 
 #ifdef HAVE_FCNTL_H
-#define INCLUDED_FCNTL
 #include <fcntl.h>
 #endif
 #ifndef O_WRONLY

diff --git a/src/callproc.c b/src/callproc.c
index f922433..82a5ebb 100644 (file)
--- a/src/callproc.c
+++ b/src/callproc.c
@@ -39,7 +39,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include <sys/file.h>
 #ifdef HAVE_FCNTL_H
-#define INCLUDED_FCNTL
 #include <fcntl.h>
 #endif
 
@@ -53,7 +52,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #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 --git a/src/systty.h b/src/systty.h
index fcc6cf8..39feef9 100644 (file)
--- a/src/systty.h
+++ b/src/systty.h
@@ -27,17 +27,13 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #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 @@ struct emacs_tty {
    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);
 
 \f
 /* Define EMACS_TTY_TABS_OK.  */

diff --git a/src/xterm.c b/src/xterm.c
index f867632..f195c4f 100644 (file)
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -56,9 +56,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "systime.h"
 
-#ifndef INCLUDED_FCNTL
 #include <fcntl.h>
-#endif
 #include <ctype.h>
 #include <errno.h>
 #include <setjmp.h>