From 68f28fc19f111ff1b4f6918d352932ca2291f949 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Thu, 12 Mar 2009 17:33:51 +0000 Subject: [PATCH] Minor post-merge compilation fixes. It still does not compile, and we are going to merge up again before we fix that. --- osdep.h | 2 -- xen-config-host.h | 5 +++++ xen-setup | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/osdep.h b/osdep.h index f21db732..2bd2e62d 100644 --- 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 3d53364f..3d26f46e 100644 --- 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 2a86a899..ebfad966 100755 --- 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 -- 2.39.5