fix compilation for MinGW

diff --git a/ChangeLog b/ChangeLog
index c2e450d6ca9cd6aa2555168fb0a3fba23259bad6..ae8d01c4b32d397ff3159799bac7bc2a63d67c30 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Aug 12 17:20:36 JST 2008 Atsushi SAKAI <sakaia@jp.fujitsu.com>
+
+       * src/domain.conf.c src/network_conf.c src/util.c src/virsh.c
+         tests/testutilsxen.c: fix compilation for MinGW
+
 Tue Aug 12 10:09:23 CEST 2008 Daniel Veillard <veillard@redhat.com>
 
        * python/generator.py: patch from Cole Robinson trying to fix

diff --git a/src/domain_conf.c b/src/domain_conf.c
index 237579ff1537a787b8f094ca88b11164edda41cb..4f20cac9940f5ae241fcb1099bdb0ee42a314b6b 100644 (file)
--- a/src/domain_conf.c
+++ b/src/domain_conf.c
@@ -24,6 +24,7 @@
 #include <config.h>
 
 #include <sys/types.h>
+#include <sys/stat.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <dirent.h>

diff --git a/src/network_conf.c b/src/network_conf.c
index f70c73dac2fc261ac01e0750426e8588fbf09610..8af40d205a31b53abdf61bf2a7139709cf5947ca 100644 (file)
--- a/src/network_conf.c
+++ b/src/network_conf.c
@@ -27,6 +27,7 @@
 
 #include <arpa/inet.h>
 #include <sys/types.h>
+#include <sys/stat.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <dirent.h>

diff --git a/src/util.c b/src/util.c
index d1b7ae16d4a1a03f54f6fe9b8fed3ee160410724..9f056e01c534e371087cad47cded8860a7b473e0 100644 (file)
--- a/src/util.c
+++ b/src/util.c
@@ -262,7 +262,7 @@ virRun(virConnectPtr conn,
 
 int
 virExec(virConnectPtr conn,
-        char **argv ATTRIBUTE_UNUSED,
+        const char *const*argv ATTRIBUTE_UNUSED,
         int *retpid ATTRIBUTE_UNUSED,
         int infd ATTRIBUTE_UNUSED,
         int *outfd ATTRIBUTE_UNUSED,
@@ -274,7 +274,7 @@ virExec(virConnectPtr conn,
 
 int
 virExecNonBlock(virConnectPtr conn,
-                char **argv ATTRIBUTE_UNUSED,
+                const char *const*argv ATTRIBUTE_UNUSED,
                 int *retpid ATTRIBUTE_UNUSED,
                 int infd ATTRIBUTE_UNUSED,
                 int *outfd ATTRIBUTE_UNUSED,

diff --git a/src/virsh.c b/src/virsh.c
index 5499b374bce864f1f85789174ce394cf530b1064..122ff6fc9c17c01b2a9f4f59911fa95cdca12786 100644 (file)
--- a/src/virsh.c
+++ b/src/virsh.c
@@ -80,6 +80,9 @@ static char *progname;
 #define LVL_WARNING   "WARNING"
 #define LVL_ERROR     "ERROR"
 
+#ifndef WEXITSTATUS
+# define WEXITSTATUS(x) ((x) & 0xff)
+#endif
 /**
  * vshErrorLevel:
  *

diff --git a/tests/testutilsxen.c b/tests/testutilsxen.c
index 7685bd2cde1543b4f9b6a1bfa525f3c011354016..a16d91291f915413eaf3aa9ef4711cdfa15d689f 100644 (file)
--- a/tests/testutilsxen.c
+++ b/tests/testutilsxen.c
@@ -1,5 +1,6 @@
 #include <config.h>
 
+#ifdef WITH_XEN
 #include <sys/utsname.h>
 #include <stdlib.h>
 
@@ -51,3 +52,4 @@ cleanup:
     virCapabilitiesFree(caps);
     return NULL;
 }
+#endif