From 6533cf24528c1d3b2fd471d3ae5a312baac7ce15 Mon Sep 17 00:00:00 2001
From: Giuseppe Scrivano <gscrivano@gnu.org>
Date: Sun, 25 Mar 2012 17:49:55 +0200
Subject: [PATCH] Assume some headers files provided by gnulib are always
 present.

---
 src/ChangeLog |  9 +++++++++
 src/connect.c | 13 +++----------
 src/ptimer.c  |  4 +---
 src/utils.c   |  4 +---
 4 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/src/ChangeLog b/src/ChangeLog
index f52eae29..7c7fb93f 100644
--- 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 34b40abc..119ccb71 100644
--- 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 c06e8b90..c53b5e72 100644
--- 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 244b03cd..1486ed0b 100644
--- 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