Fix undefined reference to 'close_used_without_including_unistd_h'

Found while trying to cross-compile libvirt on Fedora 12 for Windows.
gnulib redefines 'close' to 'close_used_without_including_unistd_h'
in sys/socket.h if winsock2.h is present and unistd.h has not been
included before sys/socket.h. Reorder some includes to fix this.

diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c
index ab76f21dd71ca61882cc438f91249dce411bd7e2..a64adf95c3b1811164042d20a001870e60c46b0c 100644 (file)
--- a/src/conf/network_conf.c
+++ b/src/conf/network_conf.c
@@ -25,10 +25,10 @@
 
 #include <config.h>
 
+#include <unistd.h>
 #include <arpa/inet.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <unistd.h>
 #include <fcntl.h>
 #include <string.h>
 #include <dirent.h>

diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c
index 23fd0e3264972df363b4c74fd65e3a32b490fd07..be51366d4b454abc615bbd8848fb827148f4af97 100644 (file)
--- a/src/remote/remote_driver.c
+++ b/src/remote/remote_driver.c
@@ -23,10 +23,6 @@
 
 #include <config.h>
 
-/* Windows socket compatibility functions. */
-#include <errno.h>
-#include <sys/socket.h>
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -37,7 +33,11 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 
-#ifndef HAVE_WINSOCK2_H                /* Unix & Cygwin. */
+/* Windows socket compatibility functions. */
+#include <errno.h>
+#include <sys/socket.h>
+
+#ifndef HAVE_WINSOCK2_H /* Unix & Cygwin. */
 # include <sys/un.h>
 # include <net/if.h>
 # include <netinet/in.h>

diff --git a/src/util/util.h b/src/util/util.h
index 49b27f2cddb22cf2e4841a5b28f1d4faf7dd3e4f..d556daa4145136fea2a8de4a2bff9d67be9eb5ee 100644 (file)
--- a/src/util/util.h
+++ b/src/util/util.h
@@ -27,6 +27,7 @@
 
 #include "verify.h"
 #include "internal.h"
+#include <unistd.h>
 #include <sys/select.h>
 #include <sys/types.h>