From 47aea7e5a82ef5f80b17a248acf22e8bd5628686 Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Fri, 29 Feb 2008 14:09:43 +0000 Subject: use the right names for dbus version macros 2008-02-29 Benjamin Otte * common/gdbusutils.c: (dbus_source_add_watch): * daemon/dbus-gmain.c: (connection_setup_add_watch): use the right names for dbus version macros svn path=/trunk/; revision=1458 --- common/gdbusutils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'common') diff --git a/common/gdbusutils.c b/common/gdbusutils.c index 7876525e..24a588d5 100644 --- a/common/gdbusutils.c +++ b/common/gdbusutils.c @@ -915,7 +915,7 @@ dbus_source_add_watch (DBusSource *dbus_source, handler->dbus_source = dbus_source; handler->watch = watch; -#if (DBUS_VERSION_MAJOR == 1 && DBUS_VERSION_MINOR == 1 && DBUS_VERSION_MICRO >= 1) || (DBUS_VERSION_MAJOR == 1 && DBUS_VERSION_MAJOR > 1) || (DBUS_VERSION_MAJOR > 1) +#if (DBUS_MAJOR_VERSION == 1 && DBUS_MINOR_VERSION == 1 && DBUS_MICRO_VERSION >= 1) || (DBUS_MAJOR_VERSION == 1 && DBUS_MINOR_VERSION > 1) || (DBUS_MAJOR_VERSION > 1) fd = dbus_watch_get_unix_fd (watch); #else fd = dbus_watch_get_fd (watch); -- cgit v1.2.1