diff options
| author | Andreas Volz <andreas@er00923n.fritz.box> | 2011-11-11 10:08:00 +0100 |
|---|---|---|
| committer | Andreas Volz <andreas@er00923n.fritz.box> | 2011-11-11 10:08:00 +0100 |
| commit | 4ac8b072e343fe521c921e89827f6f876127b502 (patch) | |
| tree | 940d62376b0ac2bbcb8ecb55dfcb753d541150f9 | |
| parent | cdd13a374784dab91746081143a4479ee174bac2 (diff) | |
| parent | 3f1ca07e13487f18fc5b8ae90e29955052aafc75 (diff) | |
| download | dbus-c++-4ac8b072e343fe521c921e89827f6f876127b502.tar.gz | |
Merge commit 'refs/merge-requests/4' of git://gitorious.org/dbus-cplusplus/mainline into merge-requests/4
| -rw-r--r-- | src/dispatcher.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
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 } |