Commit 03f1d720 authored Sep 25, 2018 by Cédric Le Goater Committed by Peter Maydell Sep 25, 2018

aspeed/timer: fix compile breakage with clang 3.4.2



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 <thuth@redhat.com>
Signed-off-by: Cédric Le Goater <clg@kaod.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-id: 20180921161939.822-2-clg@kaod.org
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

parent 3e1dd459

hw/timer/aspeed_timer.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -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"

include/hw/timer/aspeed_timer.h

+1 −2

Original line number	Diff line number	Diff line
		@@ -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);