[Emacs-diffs] /srv/bzr/emacs/trunk r101762: Include <fcntl.h> unconditionally.

[Dan Nicolaescu]

------------------------------------------------------------
revno: 101762
committer: Dan Nicolaescu <address@hidden>
branch nick: trunk
timestamp: Sun 2010-10-03 08:19:34 -0700
message:
  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.
modified:
  src/ChangeLog
  src/alloc.c
  src/callproc.c
  src/doc.c
  src/fileio.c
  src/filelock.c
  src/keyboard.c
  src/lread.c
  src/sysdep.c
  src/termcap.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-10-03 14:48:21 +0000
+++ b/src/ChangeLog     2010-10-03 15:19:34 +0000
@@ -1,5 +1,17 @@
 2010-10-03  Dan Nicolaescu  <address@hidden>
 
+       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

=== modified file 'src/alloc.c'
--- a/src/alloc.c       2010-09-23 12:09:12 +0000
+++ b/src/alloc.c       2010-10-03 15:19:34 +0000
@@ -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
 

=== modified file 'src/callproc.c'
--- a/src/callproc.c    2010-10-01 13:56:33 +0000
+++ b/src/callproc.c    2010-10-03 15:19:34 +0000
@@ -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 */

=== modified file 'src/doc.c'
--- a/src/doc.c 2010-09-23 19:53:46 +0000
+++ b/src/doc.c 2010-10-03 15:19:34 +0000
@@ -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>

=== modified file 'src/fileio.c'
--- a/src/fileio.c      2010-10-01 13:56:33 +0000
+++ b/src/fileio.c      2010-10-03 15:19:34 +0000
@@ -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>

=== modified file 'src/filelock.c'
--- a/src/filelock.c    2010-10-01 13:56:33 +0000
+++ b/src/filelock.c    2010-10-03 15:19:34 +0000
@@ -31,9 +31,7 @@
 #endif
 
 #include <sys/file.h>
-#ifdef HAVE_FCNTL_H
 #include <fcntl.h>
-#endif
 
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>

=== modified file 'src/keyboard.c'
--- a/src/keyboard.c    2010-10-03 00:59:02 +0000
+++ b/src/keyboard.c    2010-10-03 15:19:34 +0000
@@ -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

=== modified file 'src/lread.c'
--- a/src/lread.c       2010-09-25 11:55:30 +0000
+++ b/src/lread.c       2010-10-03 15:19:34 +0000
@@ -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

=== modified file 'src/sysdep.c'
--- a/src/sysdep.c      2010-10-03 14:43:17 +0000
+++ b/src/sysdep.c      2010-10-03 15:19:34 +0000
@@ -71,10 +71,7 @@
 #endif
 
 #include <sys/file.h>
-
-#ifdef HAVE_FCNTL_H
 #include <fcntl.h>
-#endif
 
 #include "systty.h"
 #include "syswait.h"

=== modified file 'src/termcap.c'
--- a/src/termcap.c     2010-07-08 04:55:07 +0000
+++ b/src/termcap.c     2010-10-03 15:19:34 +0000
@@ -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