diff options
| author | Cédric Le Goater | 2018-09-25 15:02:33 +0200 |
|---|---|---|
| committer | Peter Maydell | 2018-09-25 16:13:24 +0200 |
| commit | 03f1d7201a8ac6adeb3aae8c575f3e67e153c54a (patch) | |
| tree | 36bf09f8939a1fad46fbbc1c986e57a2dd2f0d3a /hw/timer/aspeed_timer.c | |
| parent | hw/timer/cmsdk-apb-dualtimer: Add missing 'break' statements (diff) | |
| download | qemu-03f1d7201a8ac6adeb3aae8c575f3e67e153c54a.tar.gz qemu-03f1d7201a8ac6adeb3aae8c575f3e67e153c54a.tar.xz qemu-03f1d7201a8ac6adeb3aae8c575f3e67e153c54a.zip | |
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>
Diffstat (limited to 'hw/timer/aspeed_timer.c')
| -rw-r--r-- | hw/timer/aspeed_timer.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/hw/timer/aspeed_timer.c b/hw/timer/aspeed_timer.c index 5e3f51b66b..54b400b94a 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" |