Create replacement sys/stat.h if needed.

Remove #ifdef HAVE_SYS_STAT_H wrapper.  ok djm@

diff --git a/clientloop.c b/clientloop.c
index cf51897d6651fef68549a6c2e49d8fb14f3c543d..cc6f64a2b8b5d3dbb215bd379758b3b83673c9ba 100644 (file)
--- a/clientloop.c
+++ b/clientloop.c
@@ -63,9 +63,7 @@
 
 #include <sys/types.h>
 #include <sys/ioctl.h>
-#ifdef HAVE_SYS_STAT_H
-# include <sys/stat.h>
-#endif
+#include <sys/stat.h>
 #include <sys/time.h>
 #include <sys/socket.h>
 

diff --git a/configure.ac b/configure.ac
index 4c2a2b7ec1316c754ccf909b819265c78b5b0b96..05a302e12d2d774fbc1aea33550fd9de79b25528 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -530,7 +530,7 @@ AC_CHECK_HEADERS([ \
 # the equivalent file.  This avoids having to wrap those includes in
 # '#ifdef HAVE_FOO_H'.  If we create any such headers, add the path to includes.
 compatincludes=no
-AC_CHECK_HEADERS([ifaddrs.h paths.h poll.h stdint.h sys/time.h util.h], [], [
+AC_CHECK_HEADERS([ifaddrs.h paths.h poll.h stdint.h sys/stat.h sys/time.h util.h], [], [
     compatincludes="`pwd`/openbsd-compat/include"
     header="$compatincludes/$ac_header"
     dir=`dirname "$header"`

diff --git a/openbsd-compat/bsd-openpty.c b/openbsd-compat/bsd-openpty.c
index 3e58ace2604f75d5a6023f9aceefd06c46c06ee6..f08d6156d284ac82998a77919083c72ed056fe7a 100644 (file)
--- a/openbsd-compat/bsd-openpty.c
+++ b/openbsd-compat/bsd-openpty.c
@@ -39,9 +39,7 @@
 
 #include <stdlib.h>
 
-#ifdef HAVE_SYS_STAT_H
-# include <sys/stat.h>
-#endif
+#include <sys/stat.h>
 #ifdef HAVE_SYS_IOCTL_H
 # include <sys/ioctl.h>
 #endif

diff --git a/openbsd-compat/daemon.c b/openbsd-compat/daemon.c
index 3efe14c68c415b1639244e33b988b2c8bf9b94b3..2564669596214b02e73903ce49fb615a92fa1b1e 100644 (file)
--- a/openbsd-compat/daemon.c
+++ b/openbsd-compat/daemon.c
@@ -36,9 +36,7 @@
 
 #include <sys/types.h>
 
-#ifdef HAVE_SYS_STAT_H
-# include <sys/stat.h>
-#endif
+#include <sys/stat.h>
 
 #ifdef HAVE_FCNTL_H
 # include <fcntl.h>

diff --git a/scp.c b/scp.c
index f44470d763a72245361755afd4866c9021bb5580..3d045bc6bcf0eba46cab32b36ec51bfa9e252ac5 100644 (file)
--- a/scp.c
+++ b/scp.c
@@ -74,9 +74,7 @@
 #include "includes.h"
 
 #include <sys/types.h>
-#ifdef HAVE_SYS_STAT_H
-# include <sys/stat.h>
-#endif
+#include <sys/stat.h>
 #include <poll.h>
 #include <sys/time.h>
 #include <sys/wait.h>

diff --git a/session.c b/session.c
index 6d16564282c445c0770cdf83fde64a543cf5f590..e78c85cfdfea61abed101d0cff9493c138e35fa8 100644 (file)
--- a/session.c
+++ b/session.c
@@ -36,9 +36,7 @@
 #include "includes.h"
 
 #include <sys/types.h>
-#ifdef HAVE_SYS_STAT_H
-# include <sys/stat.h>
-#endif
+#include <sys/stat.h>
 #include <sys/socket.h>
 #include <sys/un.h>
 #include <sys/wait.h>

diff --git a/sftp-client.c b/sftp-client.c
index 6ff0db7f99016ae577df82209034b3924d3c23f1..0702abd5eb3eebcfba602ecae69c3ba5a2e95a84 100644 (file)
--- a/sftp-client.c
+++ b/sftp-client.c
@@ -27,9 +27,7 @@
 #include <sys/statvfs.h>
 #endif
 #include "openbsd-compat/sys-queue.h"
-#ifdef HAVE_SYS_STAT_H
-# include <sys/stat.h>
-#endif
+#include <sys/stat.h>
 #include <sys/time.h>
 #include <sys/uio.h>
 

diff --git a/sftp-glob.c b/sftp-glob.c
index 1b82759b04d6179b463bc98ae2de10e8b48845fb..e054e75e80af4696d09666ef29cc7f7140bf2ec2 100644 (file)
--- a/sftp-glob.c
+++ b/sftp-glob.c
@@ -18,9 +18,7 @@
 #include "includes.h"
 
 #include <sys/types.h>
-#ifdef HAVE_SYS_STAT_H
-# include <sys/stat.h>
-#endif
+#include <sys/stat.h>
 
 #include <dirent.h>
 #include <stdlib.h>

diff --git a/sftp.c b/sftp.c
index 9cb654a0e194f6345a2298cc412bd33e639bec7b..5d6d782f4c253fa78e2d824eacf64edc1d4f91c8 100644 (file)
--- a/sftp.c
+++ b/sftp.c
@@ -19,9 +19,7 @@
 
 #include <sys/types.h>
 #include <sys/ioctl.h>
-#ifdef HAVE_SYS_STAT_H
-# include <sys/stat.h>
-#endif
+#include <sys/stat.h>
 #include <sys/socket.h>
 #include <sys/wait.h>
 #ifdef HAVE_SYS_STATVFS_H

diff --git a/ssh.c b/ssh.c
index 93dbd2e5e5464f7bcc15297f82486af6536300a5..58cfedf6d969f7c699f397efd01d5bd0eaf376f5 100644 (file)
--- a/ssh.c
+++ b/ssh.c
@@ -43,9 +43,7 @@
 #include "includes.h"
 
 #include <sys/types.h>
-#ifdef HAVE_SYS_STAT_H
-# include <sys/stat.h>
-#endif
+#include <sys/stat.h>
 #include <sys/resource.h>
 #include <sys/ioctl.h>
 #include <sys/socket.h>

diff --git a/sshd-session.c b/sshd-session.c
index b737e5911749a5f8ddac089c7334ca25a0bf0d63..7abc2b4a501369d871645d32544fbd450f0700cd 100644 (file)
--- a/sshd-session.c
+++ b/sshd-session.c
@@ -32,9 +32,7 @@
 #include <sys/types.h>
 #include <sys/ioctl.h>
 #include <sys/socket.h>
-#ifdef HAVE_SYS_STAT_H
-# include <sys/stat.h>
-#endif
+#include <sys/stat.h>
 #include <sys/time.h>
 #include "openbsd-compat/sys-tree.h"
 #include "openbsd-compat/sys-queue.h"

diff --git a/sshd.c b/sshd.c
index 87601740b17fcfa8c2b65ff6750df66b297c185c..3c76b60b0f0378e3ae9b70ba5729615081647455 100644 (file)
--- a/sshd.c
+++ b/sshd.c
@@ -29,9 +29,7 @@
 #include <sys/types.h>
 #include <sys/ioctl.h>
 #include <sys/socket.h>
-#ifdef HAVE_SYS_STAT_H
-# include <sys/stat.h>
-#endif
+#include <sys/stat.h>
 #include <sys/time.h>
 #include "openbsd-compat/sys-tree.h"
 #include "openbsd-compat/sys-queue.h"