mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-12-15 08:56:34 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

build-sys: Drop ancient check for dbus_watch_get_unix_fd()

Browse source 
This function was added shortly after dbus 1.1.0, and our minimum
required dbus version is greater than 1.4.
This commit is contained in:
Arun Raghavan 2018-05-20 08:27:42 +05:30 • committed by Arun Raghavan
parent 6d7a266e0e
commit f38485dc1a
3 changed files with 0 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

9
configure.ac
View file

@ -1041,15 +1041,6 @@ AS_IF([test "x$enable_dbus" != "xno"],
AS_IF([test "x$enable_dbus" = "xyes" && test "x$HAVE_DBUS" = "x0"], AS_IF([test "x$enable_dbus" = "xyes" && test "x$HAVE_DBUS" = "x0"],
[AC_MSG_ERROR([*** D-Bus not available or too old version])]) [AC_MSG_ERROR([*** D-Bus not available or too old version])])
AS_IF([test "x$HAVE_DBUS" = "x1"],
[
save_CFLAGS="$CFLAGS"; CFLAGS="$CFLAGS $DBUS_CFLAGS"
save_LIBS="$LIBS"; LIBS="$LIBS $DBUS_LIBS"
AC_CHECK_FUNCS(dbus_watch_get_unix_fd)
CFLAGS="$save_CFLAGS"
LIBS="$save_LIBS"
])
AC_SUBST(HAVE_DBUS) AC_SUBST(HAVE_DBUS)
AM_CONDITIONAL([HAVE_DBUS], [test "x$HAVE_DBUS" = x1]) AM_CONDITIONAL([HAVE_DBUS], [test "x$HAVE_DBUS" = x1])
AS_IF([test "x$HAVE_DBUS" = "x1"], AC_DEFINE([HAVE_DBUS], 1, [Have D-Bus.])) AS_IF([test "x$HAVE_DBUS" = "x1"], AC_DEFINE([HAVE_DBUS], 1, [Have D-Bus.]))

8
src/modules/dbus/module-dbus-protocol.c
View file

@ -218,11 +218,7 @@ static void io_event_cb(pa_mainloop_api *mainloop, pa_io_event *e, int fd, pa_io
unsigned int flags = 0; unsigned int flags = 0;
DBusWatch *watch = userdata; DBusWatch *watch = userdata;
#ifdef HAVE_DBUS_WATCH_GET_UNIX_FD
pa_assert(fd == dbus_watch_get_unix_fd(watch)); 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)) { if (!dbus_watch_get_enabled(watch)) {
pa_log_warn("Asked to handle disabled watch: %p %i", (void*) watch, fd); pa_log_warn("Asked to handle disabled watch: %p %i", (void*) watch, fd);
@ -289,11 +285,7 @@ static dbus_bool_t watch_add_cb(DBusWatch *watch, void *data) {
ev = mainloop->io_new( ev = mainloop->io_new(
mainloop, mainloop,
#ifdef HAVE_DBUS_WATCH_GET_UNIX_FD
dbus_watch_get_unix_fd(watch), dbus_watch_get_unix_fd(watch),
#else
dbus_watch_get_fd(watch),
#endif
get_watch_flags(watch), io_event_cb, watch); get_watch_flags(watch), io_event_cb, watch);
dbus_watch_set_data(watch, ev, NULL); dbus_watch_set_data(watch, ev, NULL);

8
src/pulsecore/dbus-util.c
View file

@ -100,11 +100,7 @@ static void handle_io_event(pa_mainloop_api *ea, pa_io_event *e, int fd, pa_io_e
unsigned int flags = 0; unsigned int flags = 0;
DBusWatch *watch = userdata; DBusWatch *watch = userdata;
#ifdef HAVE_DBUS_WATCH_GET_UNIX_FD
pa_assert(fd == dbus_watch_get_unix_fd(watch)); 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)) { if (!dbus_watch_get_enabled(watch)) {
pa_log_warn("Asked to handle disabled watch: %p %i", (void*) watch, fd); pa_log_warn("Asked to handle disabled watch: %p %i", (void*) watch, fd);
@ -153,11 +149,7 @@ static dbus_bool_t add_watch(DBusWatch *watch, void *data) {
ev = c->mainloop->io_new( ev = c->mainloop->io_new(
c->mainloop, c->mainloop,
#ifdef HAVE_DBUS_WATCH_GET_UNIX_FD
dbus_watch_get_unix_fd(watch), dbus_watch_get_unix_fd(watch),
#else
dbus_watch_get_fd(watch),
#endif
get_watch_flags(watch), handle_io_event, watch); get_watch_flags(watch), handle_io_event, watch);
dbus_watch_set_data(watch, ev, NULL); dbus_watch_set_data(watch, ev, NULL);