ppc: avoid typedef redefinitions

These cause compilation failures on CentOS 6 or other operating
systems with older GCCs.

Cc: David Gibson <dgibson@redhat.com>
Cc: qemu-ppc@nongnu.org
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Message-id: 1488558530-21016-3-git-send-email-pbonzini@redhat.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h
index cfd271129dd0bba1b864d96ec05ccadb70e04ad8..15f43717eb5e0fe9ebd030b4f1e831c81400a985 100644 (file)
--- a/include/hw/ppc/spapr.h
+++ b/include/hw/ppc/spapr.h
@@ -21,7 +21,6 @@ typedef struct sPAPREventSource sPAPREventSource;
 #define SPAPR_TIMEBASE_FREQ     512000000ULL
 
 typedef struct sPAPRMachineClass sPAPRMachineClass;
-typedef struct sPAPRMachineState sPAPRMachineState;
 
 #define TYPE_SPAPR_MACHINE      "spapr-machine"
 #define SPAPR_MACHINE(obj) \

diff --git a/include/hw/ppc/xics.h b/include/hw/ppc/xics.h
index 1945913bf1c91da43e6a24427e7f462d7b0dd48b..9a5e715fe553575664e2b1037b712cc88cf73641 100644 (file)
--- a/include/hw/ppc/xics.h
+++ b/include/hw/ppc/xics.h
@@ -139,9 +139,9 @@ struct ICSIRQState {
     uint8_t flags;
 };
 
-typedef struct XICSFabric {
+struct XICSFabric {
     Object parent;
-} XICSFabric;
+};
 
 #define TYPE_XICS_FABRIC "xics-fabric"
 #define XICS_FABRIC(obj)                                     \