target/xtensa: Remove duplicate typedef of DisasContext

Message ID 1515762528-22818-1-git-send-email-peter.maydell@linaro.org
State New
Headers show
Series
  • target/xtensa: Remove duplicate typedef of DisasContext
Related show

Commit Message

Peter Maydell Jan. 12, 2018, 1:08 p.m.
Some older versions of gcc complain if a typedef is defined twice:

target/xtensa/translate.c:81: error: redefinition of typedef 'DisasContext'
target/xtensa/cpu.h:339: note: previous declaration of 'DisasContext' was here

Remove the now-redundant typedef from the definition of the struct in
translate.c.

Reported-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
 target/xtensa/translate.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Peter Maydell Jan. 12, 2018, 4:01 p.m. | #1
On 12 January 2018 at 13:08, Peter Maydell <peter.maydell@linaro.org> wrote:
> Some older versions of gcc complain if a typedef is defined twice:
>
> target/xtensa/translate.c:81: error: redefinition of typedef 'DisasContext'
> target/xtensa/cpu.h:339: note: previous declaration of 'DisasContext' was here
>
> Remove the now-redundant typedef from the definition of the struct in
> translate.c.
>
> Reported-by: Paolo Bonzini <pbonzini@redhat.com>
> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
> ---

...applied to master as a buildfix.

-- PMM

Patch

diff --git a/target/xtensa/translate.c b/target/xtensa/translate.c
index 4bdfcd2..bec9efc 100644
--- a/target/xtensa/translate.c
+++ b/target/xtensa/translate.c
@@ -50,7 +50,7 @@ 
 /* is_jmp field values */
 #define DISAS_UPDATE  DISAS_TARGET_0 /* cpu state was modified dynamically */
 
-typedef struct DisasContext {
+struct DisasContext {
     const XtensaConfig *config;
     TranslationBlock *tb;
     uint32_t pc;
@@ -78,7 +78,7 @@  typedef struct DisasContext {
     uint32_t *raw_arg;
     xtensa_insnbuf insnbuf;
     xtensa_insnbuf slotbuf;
-} DisasContext;
+};
 
 static TCGv_i32 cpu_pc;
 static TCGv_i32 cpu_R[16];