diff options
Diffstat (limited to 'src/modules/dbus-util.c')
| -rw-r--r-- | src/modules/dbus-util.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/src/modules/dbus-util.c b/src/modules/dbus-util.c index 24936faa..0a794fe1 100644 --- a/src/modules/dbus-util.c +++ b/src/modules/dbus-util.c @@ -96,7 +96,11 @@ static void handle_io_event(PA_GCC_UNUSED pa_mainloop_api *ea, pa_io_event *e, i unsigned int flags = 0; DBusWatch *watch = userdata; +#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) pa_assert(fd == dbus_watch_get_unix_fd(watch)); +#else + pa_assert(fd == dbus_watch_get_fd(watch)); +#endif if (!dbus_watch_get_enabled(watch)) { pa_log_warn("Asked to handle disabled watch: %p %i", (void*) watch, fd); @@ -137,7 +141,13 @@ static dbus_bool_t add_watch(DBusWatch *watch, void *data) { pa_assert(watch); pa_assert(c); - ev = c->mainloop->io_new(c->mainloop, dbus_watch_get_unix_fd(watch), get_watch_flags(watch), handle_io_event, watch); + ev = c->mainloop->io_new(c->mainloop, +#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) + dbus_watch_get_unix_fd(watch), +#else + dbus_watch_get_fd(watch), +#endif + get_watch_flags(watch), handle_io_event, watch); dbus_watch_set_data(watch, ev, NULL); |