diff options
| author | pl <pl@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-04-27 01:25:32 +0000 |
|---|---|---|
| committer | pl <pl@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-04-27 01:25:32 +0000 |
| commit | b509c4a94a574dfaee8b0a230dfd7bb4163d927e (patch) | |
| tree | cd117364ec0f06bbaccc79d1eff9bb6921d266a5 /libao2 | |
| parent | 40f45bc8b388c3fd749baf66e15f604ab8162915 (diff) | |
| download | mpv-b509c4a94a574dfaee8b0a230dfd7bb4163d927e.tar.bz2 mpv-b509c4a94a574dfaee8b0a230dfd7bb4163d927e.tar.xz | |
fix for latest alsa (sys/asoundlib.h has been moved to alsa/asoundlib.h)
cleanups for "usr/src/DVB/ost/include" detection
small cosmetic fixes
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5856 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libao2')
| -rw-r--r-- | libao2/ao_alsa1x.c | 7 | ||||
| -rw-r--r-- | libao2/ao_alsa9.c | 7 |
2 files changed, 14 insertions, 0 deletions
diff --git a/libao2/ao_alsa1x.c b/libao2/ao_alsa1x.c index f95d21a84b..39107960c4 100644 --- a/libao2/ao_alsa1x.c +++ b/libao2/ao_alsa1x.c @@ -12,7 +12,14 @@ */ #include <errno.h> + +#if HAVE_SYS_ASOUNDLIB_H #include <sys/asoundlib.h> +#elif HAVE_ALSA_ASOUNDLIB_H +#include <alsa/asoundlib.h> +#else +#error "asoundlib.h is not in sys/ or alsa/ - please bugreport" +#endif #include "../config.h" diff --git a/libao2/ao_alsa9.c b/libao2/ao_alsa9.c index f95d21a84b..39107960c4 100644 --- a/libao2/ao_alsa9.c +++ b/libao2/ao_alsa9.c @@ -12,7 +12,14 @@ */ #include <errno.h> + +#if HAVE_SYS_ASOUNDLIB_H #include <sys/asoundlib.h> +#elif HAVE_ALSA_ASOUNDLIB_H +#include <alsa/asoundlib.h> +#else +#error "asoundlib.h is not in sys/ or alsa/ - please bugreport" +#endif #include "../config.h" |