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 --git a/src/ChangeLog b/src/ChangeLog
index 9ea2adddc650096cf4c71e23fd4dcf52bd81146a..c535c2fc64a4911829882497ba6c70c83ee12094 100644 (file)
--- 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 5cbc7cfe4110fff64856434da220a372cf8ac408..0ab4f9f8f8532be000e8113668ef7a262d901227 100644 (file)
--- 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 346a913626dff63202a34584214f73814db70dc3..ee587605f7a1db1b4965baf4ab1a8b0c45cc03ae 100644 (file)
--- 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 8d5727b95c6fa9c9afb8a75cb4ade95473e3c9fb..0e9714b4512b0e1f038ff328123ea44cc4cf4a90 100644 (file)
--- 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 bf6b76998839da141d2b4dc79a89fdea93a5e8e4..bdef3008750dc86fc20d106f599513fb37c78f74 100644 (file)
--- 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 59076eb6a4a6a9c27538f1376f6022a0d90e1f66..acca723441939bfee9de4cd2416eae3015986381 100644 (file)
--- 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 890ab80aee6b5fda1b90edc4640d8780881f87a8..9e7225805d5d0fcc50b45bb03800ffe5a0aed605 100644 (file)
--- 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 81b7082204c19058fef37dc245b8c0f87f7bfd08..69e9a4629d219600bf3543d04d92ae5ac5d09c1f 100644 (file)
--- 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 027ebef957692720dd792c3aa18ead506eefb248..f46a9e614b9bbcb2fec6b22225e27b6c81d7356f 100644 (file)
--- 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 ea4ef244f641303879beb55c6c08bc9073f2e652..a8eabf25529771152cb0aedf478aabdcbbb8067b 100644 (file)
--- 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