diff options
| author | Cédric Le Goater <clg@kaod.org> | 2016-11-07 19:03:02 +0100 |
|---|---|---|
| committer | David Gibson <david@gibson.dropbear.id.au> | 2016-11-15 10:05:51 +1100 |
| commit | ec575aa0ae8caf1c7af66dad753d1d19a958a8c5 (patch) | |
| tree | fd0ce25f00de8176d2bf6196ddc3cb97809ab4ae /hw/ppc | |
| parent | 8bd9530e1302566e9dc71abe04346ca7d16613b1 (diff) | |
| download | qemu-ec575aa0ae8caf1c7af66dad753d1d19a958a8c5.zip qemu-ec575aa0ae8caf1c7af66dad753d1d19a958a8c5.tar.gz qemu-ec575aa0ae8caf1c7af66dad753d1d19a958a8c5.tar.bz2 | |
ppc/pnv: fix compile breakage on old gcc
PnvChip is defined twice and this can confuse old compilers :
CC ppc64-softmmu/hw/ppc/pnv_xscom.o
In file included from qemu.git/hw/ppc/pnv.c:29:
qemu.git/include/hw/ppc/pnv.h:60: error: redefinition of typedef ‘PnvChip’
qemu.git/include/hw/ppc/pnv_xscom.h:24: note: previous declaration of ‘PnvChip’ was here
make[1]: *** [hw/ppc/pnv.o] Error 1
make[1]: *** Waiting for unfinished jobs....
Signed-off-by: Cédric Le Goater <clg@kaod.org>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Diffstat (limited to 'hw/ppc')
| -rw-r--r-- | hw/ppc/pnv_core.c | 1 | ||||
| -rw-r--r-- | hw/ppc/pnv_lpc.c | 3 | ||||
| -rw-r--r-- | hw/ppc/pnv_xscom.c | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/hw/ppc/pnv_core.c b/hw/ppc/pnv_core.c index 2acda96..76ce854 100644 --- a/hw/ppc/pnv_core.c +++ b/hw/ppc/pnv_core.c @@ -24,6 +24,7 @@ #include "hw/ppc/ppc.h" #include "hw/ppc/pnv.h" #include "hw/ppc/pnv_core.h" +#include "hw/ppc/pnv_xscom.h" static void powernv_cpu_reset(void *opaque) { diff --git a/hw/ppc/pnv_lpc.c b/hw/ppc/pnv_lpc.c index 00dbd8b..0e2117f 100644 --- a/hw/ppc/pnv_lpc.c +++ b/hw/ppc/pnv_lpc.c @@ -23,8 +23,9 @@ #include "qapi/error.h" #include "qemu/log.h" -#include "hw/ppc/pnv_lpc.h" #include "hw/ppc/pnv.h" +#include "hw/ppc/pnv_lpc.h" +#include "hw/ppc/pnv_xscom.h" #include "hw/ppc/fdt.h" #include <libfdt.h> diff --git a/hw/ppc/pnv_xscom.c b/hw/ppc/pnv_xscom.c index 5aaa264..f466461 100644 --- a/hw/ppc/pnv_xscom.c +++ b/hw/ppc/pnv_xscom.c @@ -25,8 +25,8 @@ #include "hw/sysbus.h" #include "hw/ppc/fdt.h" -#include "hw/ppc/pnv_xscom.h" #include "hw/ppc/pnv.h" +#include "hw/ppc/pnv_xscom.h" #include <libfdt.h> |