Message ID | 20170914123609.497-1-dgilbert@redhat.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On 09/14/2017 09:36 AM, Dr. David Alan Gilbert (git) wrote: > From: "Dr. David Alan Gilbert" <dgilbert@redhat.com> > > Older compilers (rhel6) don't like redefinition of typedefs Newer neither (clang-5) fatal error: redefinition of typedef [-Wtypedef-redefinition] d61d1b20610 > > Fixes: 12a6c15ef31c98ecefa63e91ac36955383038384 you mean "missed in 12a6c15ef31c98ecefa63e91ac36955383038384" > > Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > --- > target/sparc/cpu.h | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/target/sparc/cpu.h b/target/sparc/cpu.h > index b45cfb4708..1598f65927 100644 > --- a/target/sparc/cpu.h > +++ b/target/sparc/cpu.h > @@ -240,7 +240,7 @@ typedef struct trap_state { > #endif > #define TARGET_INSN_START_EXTRA_WORDS 1 > > -typedef struct sparc_def_t { > +struct sparc_def_t { > const char *name; > target_ulong iu_version; > uint32_t fpu_version; > @@ -254,7 +254,7 @@ typedef struct sparc_def_t { > uint32_t features; > uint32_t nwindows; > uint32_t maxtl; > -} sparc_def_t; > +}; > > #define CPU_FEATURE_FLOAT (1 << 0) > #define CPU_FEATURE_FLOAT128 (1 << 1) >
On 14 September 2017 at 13:36, Dr. David Alan Gilbert (git) <dgilbert@redhat.com> wrote: > From: "Dr. David Alan Gilbert" <dgilbert@redhat.com> > > Older compilers (rhel6) don't like redefinition of typedefs > > Fixes: 12a6c15ef31c98ecefa63e91ac36955383038384 > > Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com> Thanks; applied to master as a buildfix. -- PMM
diff --git a/target/sparc/cpu.h b/target/sparc/cpu.h index b45cfb4708..1598f65927 100644 --- a/target/sparc/cpu.h +++ b/target/sparc/cpu.h @@ -240,7 +240,7 @@ typedef struct trap_state { #endif #define TARGET_INSN_START_EXTRA_WORDS 1 -typedef struct sparc_def_t { +struct sparc_def_t { const char *name; target_ulong iu_version; uint32_t fpu_version; @@ -254,7 +254,7 @@ typedef struct sparc_def_t { uint32_t features; uint32_t nwindows; uint32_t maxtl; -} sparc_def_t; +}; #define CPU_FEATURE_FLOAT (1 << 0) #define CPU_FEATURE_FLOAT128 (1 << 1)