diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2014-10-31 09:24:50 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2014-11-12 10:25:00 +1000 |
| commit | adee4f239b5074d318dfc48beb0ec4e91973b449 (patch) | |
| tree | 3ee90f639976c1488f2eb837dfc6e8c84cc73774 | |
| parent | 25315ee555dfeb96d9ed83064b1022ed852b612e (diff) | |
xfree86: drop double-typedef of DBusConnection
Just include dbus.h, it's been typedef'd there since 2003.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| -rw-r--r-- | hw/xfree86/common/Makefile.am | 4 | ||||
| -rw-r--r-- | include/dbus-core.h | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/hw/xfree86/common/Makefile.am b/hw/xfree86/common/Makefile.am index 7a2b4bc1e..54e7f4d0a 100644 --- a/hw/xfree86/common/Makefile.am +++ b/hw/xfree86/common/Makefile.am @@ -103,4 +103,8 @@ if LNXACPI XORG_CFLAGS += -DHAVE_ACPI endif +if NEED_DBUS +XORG_CFLAGS += $(DBUS_CFLAGS) +endif + AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS) diff --git a/include/dbus-core.h b/include/dbus-core.h index b2d6d1b9e..d6260dc66 100644 --- a/include/dbus-core.h +++ b/include/dbus-core.h @@ -27,7 +27,7 @@ #define DBUS_CORE_H #ifdef NEED_DBUS -typedef struct DBusConnection DBusConnection; +#include <dbus/dbus.h> typedef void (*dbus_core_connect_hook) (DBusConnection * connection, void *data); |