Assume some headers files provided by gnulib are always present.

diff --git a/src/ChangeLog b/src/ChangeLog
index f52eae296696dcb85674767146d054d1485ed78f..7c7fb93f68b3ac8b0b3e7f21e13f96d8a783d6ce 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,12 @@
+2012-03-25  Giuseppe Scrivano  <gscrivano@gnu.org>
+
+       * utils.c: Include <sys/ioctl.h>.
+
+       * ptimer.c: Include <sys/time.h>.
+
+       * connect.c: Include <sys/socket.h>, <sys/select.h>, <sys/time.h>.
+       Reported by: Ray Satiro <raysatiro@yahoo.com>.
+
 2012-03-25 Ray Satiro <raysatiro@yahoo.com>
 
        * build_info.c.in: Check that HAVE_LIBSSL32 is defined when OpenSSL

diff --git a/src/connect.c b/src/connect.c
index 34b40abc5abcfb225a043f88ee55df8f5e0a5b0c..119ccb71b678b33babd1b5c995c6fd8f65f9fe07 100644 (file)
--- a/src/connect.c
+++ b/src/connect.c
@@ -36,13 +36,8 @@ as that of the covered work.  */
 #include <unistd.h>
 #include <assert.h>
 
-#ifdef HAVE_SYS_SOCKET_H
-# include <sys/socket.h>
-#endif /* def HAVE_SYS_SOCKET_H */
-
-#ifdef HAVE_SYS_SELECT_H
-# include <sys/select.h>
-#endif /* def HAVE_SYS_SELECT_H */
+#include <sys/socket.h>
+#include <sys/select.h>
 
 #ifndef WINDOWS
 # ifdef __VMS
@@ -58,9 +53,7 @@ as that of the covered work.  */
 
 #include <errno.h>
 #include <string.h>
-#ifdef HAVE_SYS_TIME_H
-# include <sys/time.h>
-#endif
+#include <sys/time.h>
 #include "utils.h"
 #include "host.h"
 #include "connect.h"

diff --git a/src/ptimer.c b/src/ptimer.c
index c06e8b90cee326cf1338a21173c7c7ad97a20fdb..c53b5e7215cd08c6d4ed62763e01bd9325d504eb 100644 (file)
--- a/src/ptimer.c
+++ b/src/ptimer.c
@@ -59,9 +59,7 @@ as that of the covered work.  */
 #include <errno.h>
 #include <unistd.h>
 #include <time.h>
-#ifdef HAVE_SYS_TIME_H
-# include <sys/time.h>
-#endif
+#include <sys/time.h>
 
 /* Cygwin currently (as of 2005-04-08, Cygwin 1.5.14) lacks clock_getres,
    but still defines _POSIX_TIMERS!  Because of that we simply use the

diff --git a/src/utils.c b/src/utils.c
index 244b03cdebcbd0f6c78a8c3bfd95ca24ded475f0..1486ed0bcfd4c38950b203954ad2aeff0d8b5baa 100644 (file)
--- a/src/utils.c
+++ b/src/utils.c
@@ -62,9 +62,7 @@ as that of the covered work.  */
 #include <sys/stat.h>
 
 /* For TIOCGWINSZ and friends: */
-#ifdef HAVE_SYS_IOCTL_H
-# include <sys/ioctl.h>
-#endif
+#include <sys/ioctl.h>
 #ifdef HAVE_TERMIOS_H
 # include <termios.h>
 #endif