Merge branch 'allow-to-disable-null-sink-rewinds' of https://gitlab.freedesktop.org/wwmm/pulseaudio into allow-to-disable-null-sink-rewinds

This commit is contained in:
Wellington Wallace 2019-05-07 11:06:59 -03:00
commit 2102f09895
2 changed files with 2 additions and 2 deletions

View file

@ -826,7 +826,7 @@ AS_IF([test "x$enable_alsa" = "xyes" && test "x$HAVE_ALSA" = "x0"],
AS_IF([test "x$HAVE_ALSA" = "x1"], AS_IF([test "x$HAVE_ALSA" = "x1"],
[ [
save_CPPFLAGS="$CPPFLAGS"; CPPFLAGS="$CPPFLAGS $ASOUNDLIB_CFLAGS" save_CPPFLAGS="$CPPFLAGS"; CPPFLAGS="$CPPFLAGS $ASOUNDLIB_CFLAGS"
AC_CHECK_HEADERS([use-case.h], HAVE_ALSA_UCM=1, HAVE_ALSA_UCM=0) AC_CHECK_HEADERS([alsa/use-case.h], HAVE_ALSA_UCM=1, HAVE_ALSA_UCM=0)
CPPFLAGS="$save_CPPFLAGS" CPPFLAGS="$save_CPPFLAGS"
], ],
HAVE_ALSA_UCM=0) HAVE_ALSA_UCM=0)

View file

@ -23,7 +23,7 @@
***/ ***/
#ifdef HAVE_ALSA_UCM #ifdef HAVE_ALSA_UCM
#include <use-case.h> #include <alsa/use-case.h>
#else #else
typedef void snd_use_case_mgr_t; typedef void snd_use_case_mgr_t;
#endif #endif