Philippe de Muyter's port patches.

svn path=/trunk/; revision=1616

diff --git a/configure.in b/configure.in
index 3a51afa17919e36bc14b25b99fa10b569653763e..44d453cebe40d0582edcff01c62223fd3d230572 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -23,7 +23,7 @@ AC_HEADER_STDC
 AC_TYPE_SIZE_T
 AC_TYPE_PID_T
 AC_TYPE_SIGNAL
-AC_CHECK_HEADERS(unistd.h termios.h termio.h sgtty.h stdarg.h alloca.h sys/itimer.h fcntl.h sys/fcntl.h memory.h) 
+AC_CHECK_HEADERS(unistd.h termios.h termio.h sgtty.h stdarg.h alloca.h sys/itimer.h fcntl.h sys/fcntl.h memory.h sys/wait.h)
 
 AC_C_CONST                     dnl getopt needs this.
 

diff --git a/daemon.c b/daemon.c
index f71d034338a1f9aa504a6e8fc2be351ee304f04c..5c66ed5ad9ee9b7bf0daaad86bf3ead9377f4267 100644 (file)
--- a/daemon.c
+++ b/daemon.c
@@ -10,7 +10,9 @@
 #include <errno.h>
 #include <signal.h>
 #include <sys/types.h>
+#ifdef HAVE_SYS_WAIT_H
 #include <sys/wait.h>
+#endif
 #ifdef HAVE_FCNTL_H
 #include <fcntl.h>
 #else /* !HAVE_FCNTL_H */
@@ -71,6 +73,8 @@ sigchld_handler (int sig)
     while ((pid = wait3(&status, WNOHANG, 0)) > 0)
        continue; /* swallow 'em up. */
 #else  /* Zooks! Nothing to do but wait(), and hope we don't block... */
+    int status;
+
     wait(&status);
 #endif
 }

diff --git a/driver.c b/driver.c
index 2548b668aab1a5b3de3193b148a8dd39dc293435..3bf6df4d1610758d4388f94ef929fd88cc0f4871 100644 (file)
--- a/driver.c
+++ b/driver.c
@@ -38,6 +38,11 @@
 #include  <sys/time.h>
 #include  <signal.h>
 
+#ifndef HAVE_STRFTIME /* For ctime prototype */
+#include  <sys/types.h>
+#include  <time.h>
+#endif
+
 #ifdef HAVE_GETHOSTBYNAME
 #include <netdb.h>
 #include "mx.h"

diff --git a/fetchmail.c b/fetchmail.c
index e6c45c02c1161cb5b555a9d748d31aeead2e393b..995da218dccb43a73a902a109cffde088741d55f 100644 (file)
--- a/fetchmail.c
+++ b/fetchmail.c
@@ -31,7 +31,9 @@
 #include <sys/time.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#ifdef HAVE_SYS_WAIT_H
 #include <sys/wait.h>
+#endif
 
 #ifdef HAVE_GETHOSTBYNAME
 #include <netdb.h>

diff --git a/rcfile_y.y b/rcfile_y.y
index 9b0573d18ac28e7c7476ddd38e1c835a78e9eae2..71d8ea4bbecc1553002e6a6afaac3a9c69fca78c 100644 (file)
--- a/rcfile_y.y
+++ b/rcfile_y.y
@@ -9,7 +9,9 @@
 #include <stdio.h>
 #include <sys/types.h>
 #include <sys/file.h>
+#if defined(HAVE_SYS_WAIT_H)
 #include <sys/wait.h>
+#endif
 #include <sys/stat.h>
 #include <errno.h>
 #if defined(STDC_HEADERS)