[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 8/8] i2c: Move typedef of bitbang_i2c_interface to i2
From: |
Thomas Huth |
Subject: |
[Qemu-devel] [PULL 8/8] i2c: Move typedef of bitbang_i2c_interface to i2c.h |
Date: |
Wed, 12 Dec 2018 10:13:52 +0100 |
From: BALATON Zoltan <address@hidden>
Clang 3.4 considers duplicate typedef in ppc4xx_i2c.h and
bitbang_i2c.h an error even if they are identical. Move it to a common
place to allow building with this clang version.
Reported-by: Thomas Huth <address@hidden>
Signed-off-by: BALATON Zoltan <address@hidden>
Acked-by: David Gibson <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Signed-off-by: Thomas Huth <address@hidden>
---
hw/i2c/bitbang_i2c.h | 2 --
include/hw/i2c/i2c.h | 2 ++
include/hw/i2c/ppc4xx_i2c.h | 3 ---
3 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/hw/i2c/bitbang_i2c.h b/hw/i2c/bitbang_i2c.h
index 3a7126d..9443021 100644
--- a/hw/i2c/bitbang_i2c.h
+++ b/hw/i2c/bitbang_i2c.h
@@ -3,8 +3,6 @@
#include "hw/i2c/i2c.h"
-typedef struct bitbang_i2c_interface bitbang_i2c_interface;
-
#define BITBANG_I2C_SDA 0
#define BITBANG_I2C_SCL 1
diff --git a/include/hw/i2c/i2c.h b/include/hw/i2c/i2c.h
index 5dc1661..cf4c45a 100644
--- a/include/hw/i2c/i2c.h
+++ b/include/hw/i2c/i2c.h
@@ -82,6 +82,8 @@ int i2c_recv(I2CBus *bus);
DeviceState *i2c_create_slave(I2CBus *bus, const char *name, uint8_t addr);
+typedef struct bitbang_i2c_interface bitbang_i2c_interface;
+
/* lm832x.c */
void lm832x_key_event(DeviceState *dev, int key, int state);
diff --git a/include/hw/i2c/ppc4xx_i2c.h b/include/hw/i2c/ppc4xx_i2c.h
index 0891a9c..b3450ba 100644
--- a/include/hw/i2c/ppc4xx_i2c.h
+++ b/include/hw/i2c/ppc4xx_i2c.h
@@ -31,9 +31,6 @@
#include "hw/sysbus.h"
#include "hw/i2c/i2c.h"
-/* from hw/i2c/bitbang_i2c.h */
-typedef struct bitbang_i2c_interface bitbang_i2c_interface;
-
#define TYPE_PPC4xx_I2C "ppc4xx-i2c"
#define PPC4xx_I2C(obj) OBJECT_CHECK(PPC4xxI2CState, (obj), TYPE_PPC4xx_I2C)
--
1.8.3.1
- [Qemu-devel] [PULL 0/8] Set minimum compiler versions to GCC 4.8 and Clang 3.4, Thomas Huth, 2018/12/12
- [Qemu-devel] [PULL 2/8] configure: Remove obsolete check for Clang < 3.2, Thomas Huth, 2018/12/12
- [Qemu-devel] [PULL 3/8] configure: Remove old -fno-gcse workaround for GCC 4.6.x and 4.7.[012], Thomas Huth, 2018/12/12
- [Qemu-devel] [PULL 1/8] configure: Add a test for the minimum compiler version, Thomas Huth, 2018/12/12
- [Qemu-devel] [PULL 5/8] audio/alsaaudio: Remove compiler check around pragma, Thomas Huth, 2018/12/12
- [Qemu-devel] [PULL 4/8] tcg/tcg.h: Remove GCC check for tcg_debug_assert() macro, Thomas Huth, 2018/12/12
- [Qemu-devel] [PULL 7/8] Remove QEMU_ARTIFICIAL macro, Thomas Huth, 2018/12/12
- [Qemu-devel] [PULL 8/8] i2c: Move typedef of bitbang_i2c_interface to i2c.h,
Thomas Huth <=
- [Qemu-devel] [PULL 6/8] includes: Replace QEMU_GNUC_PREREQ with "__has_builtin || !defined(__clang__)", Thomas Huth, 2018/12/12
- Re: [Qemu-devel] [PULL 0/8] Set minimum compiler versions to GCC 4.8 and Clang 3.4, no-reply, 2018/12/12
- Re: [Qemu-devel] [PULL 0/8] Set minimum compiler versions to GCC 4.8 and Clang 3.4, Eric Blake, 2018/12/12
- Re: [Qemu-devel] [PULL 0/8] Set minimum compiler versions to GCC 4.8 and Clang 3.4, Peter Maydell, 2018/12/14