From dec73f70fc5320faec46a21f27aae6748cea3450 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Sat, 15 Sep 2012 12:25:28 +0100
Subject: syntax: Remove HAVE_*_H tests which are always true.

Gnulib supplies replacements for these headers, so there
is no need to test.
---
 src/appliance.c |  5 +----
 src/guestfs.c   | 22 +++-------------------
 src/proto.c     | 22 +++-------------------
 3 files changed, 7 insertions(+), 42 deletions(-)

diff --git a/src/appliance.c b/src/appliance.c
index 4ed7bd76..ecbb7afe 100644
--- a/src/appliance.c
+++ b/src/appliance.c
@@ -29,13 +29,10 @@
 #include <time.h>
 #include <sys/stat.h>
 #include <sys/select.h>
+#include <sys/types.h>
 #include <sys/wait.h>
 #include <utime.h>
 
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-
 #include "glthread/lock.h"
 
 #include "guestfs.h"
diff --git a/src/guestfs.c b/src/guestfs.c
index abf4a61b..4f26bbf6 100644
--- a/src/guestfs.c
+++ b/src/guestfs.c
@@ -34,33 +34,17 @@
 #include <sys/select.h>
 #include <dirent.h>
 #include <assert.h>
-
-#include <rpc/types.h>
-#include <rpc/xdr.h>
-
-#ifdef HAVE_ERRNO_H
 #include <errno.h>
-#endif
-
-#ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
-#endif
-
-#ifdef HAVE_SYS_WAIT_H
 #include <sys/wait.h>
-#endif
-
-#ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
-#endif
-
-#ifdef HAVE_SYS_UN_H
 #include <sys/un.h>
-#endif
-
 #include <arpa/inet.h>
 #include <netinet/in.h>
 
+#include <rpc/types.h>
+#include <rpc/xdr.h>
+
 #ifdef HAVE_LIBVIRT
 #include <libvirt/libvirt.h>
 #endif
diff --git a/src/proto.c b/src/proto.c
index ae62748c..439e81dc 100644
--- a/src/proto.c
+++ b/src/proto.c
@@ -34,33 +34,17 @@
 #include <sys/select.h>
 #include <dirent.h>
 #include <signal.h>
-
-#include <rpc/types.h>
-#include <rpc/xdr.h>
-
-#ifdef HAVE_ERRNO_H
 #include <errno.h>
-#endif
-
-#ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
-#endif
-
-#ifdef HAVE_SYS_WAIT_H
 #include <sys/wait.h>
-#endif
-
-#ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
-#endif
-
-#ifdef HAVE_SYS_UN_H
 #include <sys/un.h>
-#endif
-
 #include <arpa/inet.h>
 #include <netinet/in.h>
 
+#include <rpc/types.h>
+#include <rpc/xdr.h>
+
 #include "c-ctype.h"
 #include "glthread/lock.h"
 #include "ignore-value.h"
-- 
cgit