Re: [Libguestfs] [PATCH 5/6] daemon/Win32: Don't include missing headers.
Richard W.M. Jones wrote:
Subject: [PATCH 5/6] daemon/Win32: Don't include missing
headers.
This is a partial fix for code in guestfsd.c where many of these
header files are missing on Win32.
---
daemon/guestfsd.c | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/daemon/guestfsd.c b/daemon/guestfsd.c
index 9375ede..4b91660 100644
--- a/daemon/guestfsd.c
+++ b/daemon/guestfsd.c
@@ -27,15 +27,27 @@
#include <rpc/types.h>
#include <rpc/xdr.h>
#include <getopt.h>
-#include <netdb.h>
#include <sys/param.h>
-#include <sys/select.h>
#include <sys/types.h>
-#include <sys/wait.h>
The three above are covered by gnulib.
Just use the corresponding module and you can
leave them included unconditionally. The module names:
netdb
sys_select
sys_wait
#include <sys/stat.h>
#include <fcntl.h>
#include <signal.h>
+
+#ifdef HAVE_NETDB_H
+#include <netdb.h>
+#endif
+
+#ifdef HAVE_SYS_SELECT_H
+#include <sys/select.h>
+#endif
+
+#ifdef HAVE_SYS_WAIT_H
+#include <sys/wait.h>
+#endif
+
+#ifdef HAVE_PRINTF_H
#include <printf.h>
+#endif
#include "c-ctype.h"
#include "ignore-value.h"