From ae7d54d489540b49b7c13a7df7ddc220588a2ced Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Thu, 15 Mar 2012 01:19:42 +0100 Subject: target-lm32/microblaze: Drop second CPU{LM32, MB}State typedef MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Commit 9b9a970a23625de4ae6b7461906a9a0d98d3ca95 (target-lm32/microblaze: Typedef struct CPU{MB,LM32}State) introduced necessary typedefs for cpu_mmu_index() and mmu.h respectively. On some GCC versions this leads to "error: redefinition of typedef". Drop the original typedef to hopefully fix the build. Signed-off-by: Andreas Färber Signed-off-by: Anthony Liguori --- target-microblaze/cpu.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'target-microblaze/cpu.h') diff --git a/target-microblaze/cpu.h b/target-microblaze/cpu.h index 3b52421e30..33b23c2fd7 100644 --- a/target-microblaze/cpu.h +++ b/target-microblaze/cpu.h @@ -230,7 +230,7 @@ typedef struct CPUMBState CPUMBState; #define STREAM_CONTROL (1 << 3) #define STREAM_NONBLOCK (1 << 4) -typedef struct CPUMBState { +struct CPUMBState { uint32_t debug; uint32_t btaken; uint32_t btarget; @@ -264,7 +264,7 @@ typedef struct CPUMBState { #endif CPU_COMMON -} CPUMBState; +}; CPUMBState *cpu_mb_init(const char *cpu_model); int cpu_mb_exec(CPUMBState *s); -- cgit v1.2.3