Create replacement sys/un.h if needed.

Remove #ifdef HAVE_SYS_UN_H wrapper.  ok djm@

diff --git a/configure.ac b/configure.ac
index f165794a54c6e4ba64cb2ff94034b35cb4902fd6..c75a90abe7e086a81f93472b756a583504cbcd36 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -536,6 +536,7 @@ AC_CHECK_HEADERS([ \
     stdint.h \
     sys/stat.h \
     sys/time.h \
+    sys/un.h \
     time.h \
     util.h], [], [
        compatincludes="`pwd`/openbsd-compat/include"

diff --git a/monitor_fdpass.c b/monitor_fdpass.c
index 5c0523fb33fc9883ca913081fc19328ce579423f..21697ca8893782c5a9ebb439901997009ae6dbf4 100644 (file)
--- a/monitor_fdpass.c
+++ b/monitor_fdpass.c
@@ -29,9 +29,7 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/uio.h>
-#ifdef HAVE_SYS_UN_H
 #include <sys/un.h>
-#endif
 
 #include <errno.h>
 #include <string.h>

diff --git a/openbsd-compat/port-prngd.c b/openbsd-compat/port-prngd.c
index 6afa8f913ae30acfe439079a2317843f88be66e3..ac4f27082b74e78788c5c30c077745fbdaf0b7b8 100644 (file)
--- a/openbsd-compat/port-prngd.c
+++ b/openbsd-compat/port-prngd.c
@@ -26,9 +26,7 @@
 
 #include <sys/types.h>
 #include <sys/socket.h>
-#ifdef HAVE_SYS_UN_H
-# include <sys/un.h>
-#endif
+#include <sys/un.h>
 
 #include <netinet/in.h>
 #include <arpa/inet.h>

diff --git a/ssh-agent.c b/ssh-agent.c
index 36243f1989cd0951dd33a26d713aa05a9d505a41..df241379c0b1b62bb2bd2aab6c7fa1e13e8ef3ab 100644 (file)
--- a/ssh-agent.c
+++ b/ssh-agent.c
@@ -42,9 +42,7 @@
 #include <sys/socket.h>
 #include <sys/wait.h>
 #include <sys/time.h>
-#ifdef HAVE_SYS_UN_H
-# include <sys/un.h>
-#endif
+#include <sys/un.h>
 #include "openbsd-compat/sys-queue.h"
 
 #ifdef WITH_OPENSSL