From a3d5088daa2e78d9dc2d7eddc4ac9c56cfe11caa Mon Sep 17 00:00:00 2001
From: Dan Nicolaescu <dann@ics.uci.edu>
Date: Sun, 3 Oct 2010 08:19:34 -0700
Subject: [PATCH] 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.

---
 src/ChangeLog  | 12 ++++++++++++
 src/alloc.c    |  3 ---
 src/callproc.c |  4 ----
 src/doc.c      |  3 ---
 src/fileio.c   |  4 ----
 src/filelock.c |  2 --
 src/keyboard.c |  2 --
 src/lread.c    |  2 --
 src/sysdep.c   |  3 ---
 src/termcap.c  |  2 --
 10 files changed, 12 insertions(+), 25 deletions(-)

diff --git a/src/ChangeLog b/src/ChangeLog
index 9ea2adddc65..c535c2fc64a 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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 --git a/src/alloc.c b/src/alloc.c
index 5cbc7cfe411..0ab4f9f8f85 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -65,15 +65,12 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 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 --git a/src/callproc.c b/src/callproc.c
index 346a913626d..ee587605f7a 100644
--- a/src/callproc.c
+++ b/src/callproc.c
@@ -31,20 +31,16 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #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 --git a/src/doc.c b/src/doc.c
index 8d5727b95c6..0e9714b4512 100644
--- a/src/doc.c
+++ b/src/doc.c
@@ -25,10 +25,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #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 --git a/src/fileio.c b/src/fileio.c
index bf6b7699883..bdef3008750 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -20,11 +20,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #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 --git a/src/filelock.c b/src/filelock.c
index 59076eb6a4a..acca7234419 100644
--- a/src/filelock.c
+++ b/src/filelock.c
@@ -31,9 +31,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #endif
 
 #include <sys/file.h>
-#ifdef HAVE_FCNTL_H
 #include <fcntl.h>
-#endif
 
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
diff --git a/src/keyboard.c b/src/keyboard.c
index 890ab80aee6..9e7225805d5 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -62,9 +62,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #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 --git a/src/lread.c b/src/lread.c
index 81b7082204c..69e9a4629d2 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -54,9 +54,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <locale.h>
 #endif /* HAVE_SETLOCALE */
 
-#ifdef HAVE_FCNTL_H
 #include <fcntl.h>
-#endif
 #ifndef O_RDONLY
 #define O_RDONLY 0
 #endif
diff --git a/src/sysdep.c b/src/sysdep.c
index 027ebef9576..f46a9e614b9 100644
--- a/src/sysdep.c
+++ b/src/sysdep.c
@@ -71,10 +71,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #endif
 
 #include <sys/file.h>
-
-#ifdef HAVE_FCNTL_H
 #include <fcntl.h>
-#endif
 
 #include "systty.h"
 #include "syswait.h"
diff --git a/src/termcap.c b/src/termcap.c
index ea4ef244f64..a8eabf25529 100644
--- a/src/termcap.c
+++ b/src/termcap.c
@@ -23,9 +23,7 @@ Boston, MA 02110-1301, USA.  */
 #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
-- 
2.11.4.GIT