changeset 5955:ace6ea191424

Assume HAVE_FCNTL_H (i.e., include <fcntl.h> unconditionally, and don't include <sys/file.h>).
author Jim Meyering <jim@meyering.net>
date Sat, 02 Jul 2005 09:45:07 +0000
parents 2dcad1ee5053
children ccf4c39a6263
files lib/ChangeLog lib/chown.c lib/cloexec.c lib/dup-safer.c lib/dup2.c lib/fsusage.c lib/getcwd.c lib/getloadavg.c lib/mountlist.c lib/openat.h lib/pagealign_alloc.c lib/save-cwd.c lib/tempname.c
diffstat 13 files changed, 20 insertions(+), 42 deletions(-) [+]
line wrap: on
line diff
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,11 @@
+2005-07-01  Jim Meyering  <jim@meyering.net>
+
+	* chown.c, cloexec.c, dup-safer.c, dup2.c, fsusage.c, getcwd.c:
+	* getloadavg.c, mountlist.c, openat.h, pagealign_alloc.c:
+	* save-cwd.c, tempname.c:
+	Assume HAVE_FCNTL_H (i.e., include <fcntl.h> unconditionally,
+	and don't include <sys/file.h>).
+
 2005-07-01  Paul Eggert  <eggert@cs.ucla.edu>
 
 	* xnanosleep.c: Include timespec.h, since OpenBSD 3.4 <time.h>
--- 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
--- 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
--- 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>
--- 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>
--- 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>
--- 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))
--- 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"
 
--- a/lib/mountlist.c
+++ b/lib/mountlist.c
@@ -35,9 +35,7 @@
 
 #include <errno.h>
 
-#ifdef HAVE_FCNTL_H
-# include <fcntl.h>
-#endif
+#include <fcntl.h>
 
 #ifdef HAVE_UNISTD_H
 # include <unistd.h>
--- 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>
--- a/lib/pagealign_alloc.c
+++ b/lib/pagealign_alloc.c
@@ -28,9 +28,7 @@
 #include <errno.h>
 #include <stdlib.h>
 
-#if HAVE_FCNTL_H
-# include <fcntl.h>
-#endif
+#include <fcntl.h>
 
 #if HAVE_UNISTD_H
 # include <unistd.h>
--- 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>
 
--- 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>