From 3f1ca07e13487f18fc5b8ae90e29955052aafc75 Mon Sep 17 00:00:00 2001 From: Augusto Destrero Date: Mon, 3 Jan 2011 16:48:39 +0100 Subject: use dbus_watch_get_unix_fd() only in dbus >= 1.1.1 --- src/dispatcher.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/dispatcher.cpp b/src/dispatcher.cpp index 2da4e86..57c584a 100644 --- a/src/dispatcher.cpp +++ b/src/dispatcher.cpp @@ -72,7 +72,14 @@ int Watch::descriptor() const #if HAVE_WIN32 return dbus_watch_get_socket((DBusWatch*)_int); #else - return dbus_watch_get_unix_fd((DBusWatch*)_int); + // check dbus version and use dbus_watch_get_unix_fd() only in dbus >= 1.1.1 + #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) + return dbus_watch_get_unix_fd((DBusWatch*)_int); + #else + return dbus_watch_get_fd((DBusWatch*)_int); + #endif #endif } -- cgit v1.2.1