Re: [Qemu-arm] [PATCH 01/11] aspeed/timer: fix compile breakage with clang 3.4.2

[Philippe Mathieu-Daudé]

On 8/31/18 12:38 PM, Cédric Le Goater wrote:
> In file included from /home/thuth/devel/qemu/hw/timer/aspeed_timer.c:16:
> /home/thuth/devel/qemu/include/hw/misc/aspeed_scu.h:37:3: error:
> redefinition of typedef 'AspeedSCUState' is a C11 feature
>       [-Werror,-Wtypedef-redefinition]
> } AspeedSCUState;
>   ^
> /home/thuth/devel/qemu/include/hw/timer/aspeed_timer.h:27:31: note:
> previous definition is here
> typedef struct AspeedSCUState AspeedSCUState;
> 
> Reported-by: Thomas Huth <address@hidden>
> Signed-off-by: Cédric Le Goater <address@hidden>

Reviewed-by: Philippe Mathieu-Daudé <address@hidden>

> ---
>  include/hw/timer/aspeed_timer.h | 3 +--
>  hw/timer/aspeed_timer.c         | 1 -
>  2 files changed, 1 insertion(+), 3 deletions(-)
> 
> diff --git a/include/hw/timer/aspeed_timer.h b/include/hw/timer/aspeed_timer.h
> index 040a08873432..1fb949e16710 100644
> --- a/include/hw/timer/aspeed_timer.h
> +++ b/include/hw/timer/aspeed_timer.h
> @@ -23,8 +23,7 @@
>  #define ASPEED_TIMER_H
>  
>  #include "qemu/timer.h"
> -
> -typedef struct AspeedSCUState AspeedSCUState;
> +#include "hw/misc/aspeed_scu.h"
>  
>  #define ASPEED_TIMER(obj) \
>      OBJECT_CHECK(AspeedTimerCtrlState, (obj), TYPE_ASPEED_TIMER);
> diff --git a/hw/timer/aspeed_timer.c b/hw/timer/aspeed_timer.c
> index 5e3f51b66b43..54b400b94aa9 100644
> --- a/hw/timer/aspeed_timer.c
> +++ b/hw/timer/aspeed_timer.c
> @@ -13,7 +13,6 @@
>  #include "qapi/error.h"
>  #include "hw/sysbus.h"
>  #include "hw/timer/aspeed_timer.h"
> -#include "hw/misc/aspeed_scu.h"
>  #include "qemu-common.h"
>  #include "qemu/bitops.h"
>  #include "qemu/timer.h"
>