- (dtucker) [configure.ac ssh-keygen.c openbsd-compat/bsd-openpty.c

   openbsd-compat/daemon.c] Add includes needed by open(2).  Conditionally
   include paths.h.  Fixes build error on Solaris.

diff --git a/ChangeLog b/ChangeLog
index 8cd7ab380bc03028f1b5a9cfdfa445d49165928c..34835883b5a85740e745bf9a70e94c235793d123 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+20060711
+ - (dtucker) [configure.ac ssh-keygen.c openbsd-compat/bsd-openpty.c
+   openbsd-compat/daemon.c] Add includes needed by open(2).  Conditionally
+   include paths.h.  Fixes build error on Solaris.
+
 20060710
  - (dtucker) [INSTALL] New autoconf version: 2.60.
  - OpenBSD CVS Sync

diff --git a/configure.ac b/configure.ac
index 675ff284362731fb2043da288695339bdc973bcb..9477c6b5201a24c16cff8965b28c4a5ec812ccd7 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -686,6 +686,7 @@ AC_CHECK_HEADERS( \
        dirent.h \
        endian.h \
        features.h \
+       fcntl.h \
        floatingpoint.h \
        getopt.h \
        glob.h \

diff --git a/openbsd-compat/bsd-openpty.c b/openbsd-compat/bsd-openpty.c
index 28929de67316d651d7ab142cf64843935cc8025c..0b77a1da9a593c5a2ed11b9e111298d3b4c5dd62 100644 (file)
--- a/openbsd-compat/bsd-openpty.c
+++ b/openbsd-compat/bsd-openpty.c
@@ -35,6 +35,16 @@
 #include "includes.h"
 #if !defined(HAVE_OPENPTY)
 
+#include <sys/types.h>
+
+#ifdef HAVE_SYS_STAT_H
+# include <sys/stat.h>
+#endif
+
+#ifdef HAVE_FCNTL_H
+# include <fcntl.h>
+#endif
+
 #ifdef HAVE_UTIL_H
 # include <util.h>
 #endif /* HAVE_UTIL_H */

diff --git a/openbsd-compat/daemon.c b/openbsd-compat/daemon.c
index f8a0680bf8445cc86b35b5586f6d77add2a2b615..f380139d3566fd30c5349e19e8959e95ec7e11b6 100644 (file)
--- a/openbsd-compat/daemon.c
+++ b/openbsd-compat/daemon.c
@@ -34,6 +34,16 @@
 
 #ifndef HAVE_DAEMON
 
+#include <sys/types.h>
+
+#ifdef HAVE_SYS_STAT_H
+# include <sys/stat.h>
+#endif
+
+#ifdef HAVE_FCNTL_H
+# include <fcntl.h>
+#endif
+
 int
 daemon(int nochdir, int noclose)
 {