Assume HAVE_FCNTL_H (i.e., include <fcntl.h> unconditionally,

and don't include <sys/file.h>).

diff --git a/lib/chown.c b/lib/chown.c
index ae6a504a79d7add8fec8ae1746ba7037f673d58c..2d97902e631a5ca42c0a11681b65c1ee5a5ad3a6 100644 (file)
--- a/lib/chown.c
+++ b/lib/chown.c
@@ -30,11 +30,7 @@
 #if HAVE_UNISTD_H
 # include <unistd.h>
 #endif
-#if HAVE_FCNTL_H
-# include <fcntl.h>
-#else
-# include <sys/file.h>
-#endif
+#include <fcntl.h>
 #include <errno.h>
 
 /* Provide a more-closely POSIX-conforming version of chown on

diff --git a/lib/cloexec.c b/lib/cloexec.c
index bc55d75214c211679ca0139f6e1c0975b6028f99..79d4ed0b8d29a0e03bcba408cf45f26b39e94b36 100644 (file)
--- a/lib/cloexec.c
+++ b/lib/cloexec.c
@@ -27,9 +27,7 @@
 # include <unistd.h>
 #endif
 
-#if HAVE_FCNTL_H
-# include <fcntl.h>
-#endif
+#include <fcntl.h>
 
 #ifndef FD_CLOEXEC
 # define FD_CLOEXEC 1

diff --git a/lib/dup-safer.c b/lib/dup-safer.c
index e51a8d5f577447d4a81c4ec13ba0188df71e10b1..034297aa1ef415be1e22d1933ca5bcf992824c13 100644 (file)
--- a/lib/dup-safer.c
+++ b/lib/dup-safer.c
@@ -23,9 +23,7 @@
 
 #include "unistd-safer.h"
 
-#if HAVE_FCNTL_H
-# include <fcntl.h>
-#endif
+#include <fcntl.h>
 
 #if HAVE_UNISTD_H
 # include <unistd.h>

diff --git a/lib/dup2.c b/lib/dup2.c
index c5d418f0225d02c3aff4592f7ea1e59697c44a7a..77deaf62d0b4751673d8c7f033020d53c9f23c7c 100644 (file)
--- a/lib/dup2.c
+++ b/lib/dup2.c
@@ -23,9 +23,7 @@
 
 #include <errno.h>
 
-#if HAVE_FCNTL_H
-# include <fcntl.h>
-#endif
+#include <fcntl.h>
 
 #if HAVE_UNISTD_H
 # include <unistd.h>

diff --git a/lib/fsusage.c b/lib/fsusage.c
index 972d88f122c0ccd9bed7a862ee9a91a4969e72bd..83d26af88bd724aeddd6efd40794b4a37c0db694 100644 (file)
--- a/lib/fsusage.c
+++ b/lib/fsusage.c
@@ -60,9 +60,7 @@
 # include <sys/filsys.h>       /* SVR2 */
 #endif
 
-#if HAVE_FCNTL_H
-# include <fcntl.h>
-#endif
+#include <fcntl.h>
 
 #if HAVE_SYS_STATFS_H
 # include <sys/statfs.h>

diff --git a/lib/getcwd.c b/lib/getcwd.c
index 94e5ba3b551aef0f1e0c6e2d4d6ac242bfd33bb7..86070ead87730d140653ac7a6371cb3f26c57d17 100644 (file)
--- a/lib/getcwd.c
+++ b/lib/getcwd.c
@@ -30,9 +30,7 @@
 #include <stdbool.h>
 #include <stddef.h>
 
-#if HAVE_FCNTL_H
-# include <fcntl.h> /* For AT_FDCWD on Solaris 9.  */
-#endif
+#include <fcntl.h> /* For AT_FDCWD on Solaris 9.  */
 
 #ifndef __set_errno
 # define __set_errno(val) (errno = (val))

diff --git a/lib/getloadavg.c b/lib/getloadavg.c
index 8fe542fbb1ce520e7fdfb1da492e0d04a3b62da2..d1ed95af48bc4c42df2fe35b79affe2dc036871b 100644 (file)
--- a/lib/getloadavg.c
+++ b/lib/getloadavg.c
@@ -447,11 +447,7 @@
 #  include <sys/dg_sys_info.h>
 # endif
 
-# if defined (HAVE_FCNTL_H) || defined (_POSIX_VERSION)
-#  include <fcntl.h>
-# else
-#  include <sys/file.h>
-# endif
+# include <fcntl.h>
 
 # include "unistd-safer.h"
 \f

diff --git a/lib/mountlist.c b/lib/mountlist.c
index 129e0a438ee1342ed6e6a557624f6823d7db5a46..a8ef87d8c8abdc94f2ceec66c9141b92a8bc46a0 100644 (file)
--- a/lib/mountlist.c
+++ b/lib/mountlist.c
@@ -35,9 +35,7 @@ char *strstr ();
 
 #include <errno.h>
 
-#ifdef HAVE_FCNTL_H
-# include <fcntl.h>
-#endif
+#include <fcntl.h>
 
 #ifdef HAVE_UNISTD_H
 # include <unistd.h>

diff --git a/lib/openat.h b/lib/openat.h
index 39b9bb9195502c266de71c6ceb7c965b6acc3828..d7e4efc53bd90284ffa6f53808f31a4fd1ce5959 100644 (file)
--- a/lib/openat.h
+++ b/lib/openat.h
@@ -17,9 +17,7 @@
 
 /* written by Jim Meyering */
 
-#if HAVE_FCNTL_H
-# include <fcntl.h>
-#endif
+#include <fcntl.h>
 
 #include <sys/types.h>
 #include <sys/stat.h>

diff --git a/lib/save-cwd.c b/lib/save-cwd.c
index b3d09965db8cea9dda6166abc46789aaaaea2bcc..5ad790a4d3542a7deafd4f5b9ac6325769e2b1da 100644 (file)
--- a/lib/save-cwd.c
+++ b/lib/save-cwd.c
@@ -33,11 +33,7 @@
 # include <unistd.h>
 #endif
 
-#if HAVE_FCNTL_H
-# include <fcntl.h>
-#else
-# include <sys/file.h>
-#endif
+#include <fcntl.h>
 
 #include <errno.h>
 

diff --git a/lib/tempname.c b/lib/tempname.c
index eda6235aea69e069f82df4195d332af698072152..4b0fad3f87f335d12c474b20e630e7fd5898d8d2 100644 (file)
--- a/lib/tempname.c
+++ b/lib/tempname.c
@@ -47,9 +47,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#if HAVE_FCNTL_H || _LIBC
-# include <fcntl.h>
-#endif
+#include <fcntl.h>
 
 #if HAVE_SYS_TIME_H || _LIBC
 # include <sys/time.h>