Minor post-merge compilation fixes.

It still does not compile, and we are going to merge up again before
we fix that.

diff --git a/osdep.h b/osdep.h
index f21db732c9ff2bbe7c907bd664b3d049b8e7742f..2bd2e62d398a13b3841a12188d2407b3b21940ad 100644 (file)
--- a/osdep.h
+++ b/osdep.h
@@ -87,8 +87,6 @@ int qemu_write_ok(int fd, const void *buf, size_t count);
  /* Even more simplified versions which return 1 on success or -1 on
   * failure.  EOF counts as failure but then errno is set to 0. */
 
-void *get_mmap_addr(unsigned long size);
-
 int qemu_create_pidfile(const char *filename);
 
 #ifdef _WIN32

diff --git a/xen-config-host.h b/xen-config-host.h
index 3d53364fa6c18704b725a341efdce88cf72dabe6..3d26f46e2063bb54ba3d6d538038d14ad0f96db0 100644 (file)
--- a/xen-config-host.h
+++ b/xen-config-host.h
@@ -1,3 +1,6 @@
+#ifndef XEN_CONFIG_HOST_H
+#define XEN_CONFIG_HOST_H
+
 #ifdef __MINIOS__
 #define CONFIG_STUBDOM
 #undef CONFIG_AIO
@@ -41,3 +44,5 @@ void xenstore_store_serial_port_info(int i, struct CharDriverState *chr,
 
 extern unsigned long *logdirty_bitmap;
 extern unsigned long logdirty_bitmap_size;
+
+#endif /*XEN_CONFIG_HOST_H*/

diff --git a/xen-setup b/xen-setup
index 2a86a89946d9f8ce6380cd48fd35300873cb42e8..ebfad96650ed519816de823e0f567ce87bd6815b 100755 (executable)
--- a/xen-setup
+++ b/xen-setup
@@ -9,7 +9,7 @@ rm -f config-host.mak
 
 if test -f config-host.h; then mv config-host.h config-host.h~; fi
 
-./configure --disable-gfx-check --disable-gcc-check --disable-curses --disable-slirp "$@" --prefix=/usr
+./configure --disable-gfx-check --disable-curses --disable-slirp "$@" --prefix=/usr
 
 if [ -n "$CONFIG_STUBDOM" ]
 then