From f2d4bbc618bd6aacd6926dd059a2a7ee649d4ff8 Mon Sep 17 00:00:00 2001 From: Oliver Pinter Date: Sat, 30 Mar 2013 01:38:53 +0100 Subject: [PATCH 3/4] fix round_page redefinition /tmp/qemu/hw/ppc/mac_oldworld.c:61:15: error: expected identifier or '(' static hwaddr round_page(hwaddr addr) ^ /usr/include/machine/param.h:128:27: note: expanded from macro 'round_page' ^ /tmp/qemu/hw/ppc/mac_oldworld.c:61:15: error: expected ')' static hwaddr round_page(hwaddr addr) ^ /usr/include/machine/param.h:128:27: note: expanded from macro 'round_page' ^ /tmp/qemu/hw/ppc/mac_oldworld.c:61:15: note: to match this '(' static hwaddr round_page(hwaddr addr) ^ /usr/include/machine/param.h:128:26: note: expanded from macro 'round_page' ^ /tmp/qemu/hw/ppc/mac_oldworld.c:61:15: error: expected ')' static hwaddr round_page(hwaddr addr) ^ /usr/include/machine/param.h:128:46: note: expanded from macro 'round_page' ^ /tmp/qemu/hw/ppc/mac_oldworld.c:61:15: note: to match this '(' static hwaddr round_page(hwaddr addr) ^ /usr/include/machine/param.h:128:24: note: expanded from macro 'round_page' ^ /tmp/qemu/hw/ppc/mac_oldworld.c:61:15: error: expected ')' static hwaddr round_page(hwaddr addr) ^ /usr/include/machine/param.h:128:59: note: expanded from macro 'round_page' ^ /tmp/qemu/hw/ppc/mac_oldworld.c:61:15: note: to match this '(' static hwaddr round_page(hwaddr addr) ^ /usr/include/machine/param.h:128:23: note: expanded from macro 'round_page' ^ 4 errors generated. gmake[1]: *** [hw/ppc/mac_oldworld.o] Error 1 gmake: *** [subdir-ppc-softmmu] Error 2 --- hw/ppc/mac_newworld.c | 4 ++++ hw/ppc/mac_oldworld.c | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/hw/ppc/mac_newworld.c b/hw/ppc/mac_newworld.c index a08a6b2..7df4622 100644 --- a/hw/ppc/mac_newworld.c +++ b/hw/ppc/mac_newworld.c @@ -82,6 +82,10 @@ #define UNIN_DPRINTF(fmt, ...) #endif +#ifdef __FreeBSD__ +#undef round_page +#endif // __FreeBSD__ + /* UniN device */ static void unin_write(void *opaque, hwaddr addr, uint64_t value, unsigned size) diff --git a/hw/ppc/mac_oldworld.c b/hw/ppc/mac_oldworld.c index 2778e45..9a83290 100644 --- a/hw/ppc/mac_oldworld.c +++ b/hw/ppc/mac_oldworld.c @@ -43,6 +43,10 @@ #include "sysemu/blockdev.h" #include "exec/address-spaces.h" +#ifdef __FreeBSD__ +#undef round_page +#endif // __FreeBSD__ + #define MAX_IDE_BUS 2 #define CFG_ADDR 0xf0000510 -- 1.8.2