# HG changeset patch
# User Dan Nicolaescu <dann@ics.uci.edu>
# Date 1286119174 25200
# Node ID 72f46bad930cb8bc9bc2b2789912c2f67263887c
# Parent  94fbe30e0f7d509b73828413183bd15ffc5eb861
Include <fcntl.h> unconditionally.
* src/termcap.c:
* src/sysdep.c:
* src/lread.c:
* src/keyboard.c:
* src/filelock.c:
* src/fileio.c:
* src/doc.c:
* src/callproc.c:
* src/alloc.c: Remove include guards for <fcntl.h>, process.c already
does it.

diff -r 94fbe30e0f7d -r 72f46bad930c src/ChangeLog
--- a/src/ChangeLog	Sun Oct 03 17:09:11 2010 +0200
+++ b/src/ChangeLog	Sun Oct 03 08:19:34 2010 -0700
@@ -1,5 +1,17 @@
 2010-10-03  Dan Nicolaescu  <dann@ics.uci.edu>
 
+	Include <fcntl.h> unconditionally.
+	* termcap.c:
+	* sysdep.c:
+	* lread.c:
+	* keyboard.c:
+	* filelock.c:
+	* fileio.c:
+	* doc.c:
+	* callproc.c:
+	* alloc.c: Remove include guards for <fcntl.h>, process.c already
+	does it.
+
 	* process.c: Do not include <sys/wait.h>, syswait.h does it.
 
 	* sysdep.c (flush_pending_output): Remove code, does not do
diff -r 94fbe30e0f7d -r 72f46bad930c src/alloc.c
--- a/src/alloc.c	Sun Oct 03 17:09:11 2010 +0200
+++ b/src/alloc.c	Sun Oct 03 08:19:34 2010 -0700
@@ -65,15 +65,12 @@
 extern POINTER_TYPE *sbrk ();
 #endif
 
-#ifdef HAVE_FCNTL_H
 #include <fcntl.h>
-#endif
 #ifndef O_WRONLY
 #define O_WRONLY 1
 #endif
 
 #ifdef WINDOWSNT
-#include <fcntl.h>
 #include "w32.h"
 #endif
 
diff -r 94fbe30e0f7d -r 72f46bad930c src/callproc.c
--- a/src/callproc.c	Sun Oct 03 17:09:11 2010 +0200
+++ b/src/callproc.c	Sun Oct 03 08:19:34 2010 -0700
@@ -31,20 +31,16 @@
 #endif
 
 #include <sys/file.h>
-#ifdef HAVE_FCNTL_H
 #include <fcntl.h>
-#endif
 
 #ifdef WINDOWSNT
 #define NOMINMAX
 #include <windows.h>
-#include <fcntl.h>
 #include "w32.h"
 #define _P_NOWAIT 1	/* from process.h */
 #endif
 
 #ifdef MSDOS	/* Demacs 1.1.1 91/10/16 HIRANO Satoshi */
-#include <fcntl.h>
 #include <sys/stat.h>
 #include <sys/param.h>
 #endif /* MSDOS */
diff -r 94fbe30e0f7d -r 72f46bad930c src/doc.c
--- a/src/doc.c	Sun Oct 03 17:09:11 2010 +0200
+++ b/src/doc.c	Sun Oct 03 08:19:34 2010 -0700
@@ -25,10 +25,7 @@
 #include <sys/file.h>	/* Must be after sys/types.h for USG*/
 #include <ctype.h>
 #include <setjmp.h>
-
-#ifdef HAVE_FCNTL_H
 #include <fcntl.h>
-#endif
 
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
diff -r 94fbe30e0f7d -r 72f46bad930c src/fileio.c
--- a/src/fileio.c	Sun Oct 03 17:09:11 2010 +0200
+++ b/src/fileio.c	Sun Oct 03 08:19:34 2010 -0700
@@ -20,11 +20,7 @@
 
 #include <config.h>
 #include <limits.h>
-
-#ifdef HAVE_FCNTL_H
 #include <fcntl.h>
-#endif
-
 #include <stdio.h>
 #include <sys/types.h>
 #include <sys/stat.h>
diff -r 94fbe30e0f7d -r 72f46bad930c src/filelock.c
--- a/src/filelock.c	Sun Oct 03 17:09:11 2010 +0200
+++ b/src/filelock.c	Sun Oct 03 08:19:34 2010 -0700
@@ -31,9 +31,7 @@
 #endif
 
 #include <sys/file.h>
-#ifdef HAVE_FCNTL_H
 #include <fcntl.h>
-#endif
 
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
diff -r 94fbe30e0f7d -r 72f46bad930c src/keyboard.c
--- a/src/keyboard.c	Sun Oct 03 17:09:11 2010 +0200
+++ b/src/keyboard.c	Sun Oct 03 08:19:34 2010 -0700
@@ -62,9 +62,7 @@
 #include <unistd.h>
 #endif
 
-#ifdef HAVE_FCNTL_H
 #include <fcntl.h>
-#endif
 
 /* This is to get the definitions of the XK_ symbols.  */
 #ifdef HAVE_X_WINDOWS
diff -r 94fbe30e0f7d -r 72f46bad930c src/lread.c
--- a/src/lread.c	Sun Oct 03 17:09:11 2010 +0200
+++ b/src/lread.c	Sun Oct 03 08:19:34 2010 -0700
@@ -54,9 +54,7 @@
 #include <locale.h>
 #endif /* HAVE_SETLOCALE */
 
-#ifdef HAVE_FCNTL_H
 #include <fcntl.h>
-#endif
 #ifndef O_RDONLY
 #define O_RDONLY 0
 #endif
diff -r 94fbe30e0f7d -r 72f46bad930c src/sysdep.c
--- a/src/sysdep.c	Sun Oct 03 17:09:11 2010 +0200
+++ b/src/sysdep.c	Sun Oct 03 08:19:34 2010 -0700
@@ -71,10 +71,7 @@
 #endif
 
 #include <sys/file.h>
-
-#ifdef HAVE_FCNTL_H
 #include <fcntl.h>
-#endif
 
 #include "systty.h"
 #include "syswait.h"
diff -r 94fbe30e0f7d -r 72f46bad930c src/termcap.c
--- a/src/termcap.c	Sun Oct 03 17:09:11 2010 +0200
+++ b/src/termcap.c	Sun Oct 03 08:19:34 2010 -0700
@@ -23,9 +23,7 @@
 #include <lisp.h>		/* xmalloc is here */
 /* Get the O_* definitions for open et al.  */
 #include <sys/file.h>
-#ifdef HAVE_FCNTL_H
 #include <fcntl.h>
-#endif
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif