summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-07-17 17:11:30 +0000
committerreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-07-17 17:11:30 +0000
commit6dfb85dc9ec79ec10e073e317566cfc0fbffb319 (patch)
treef867390be7f3ed87240ca4de51bf21ad5073a418
parent4cbefcd4f1acbfb5e3c24a2b4dbd472526a322cc (diff)
downloadmpv-6dfb85dc9ec79ec10e073e317566cfc0fbffb319.tar.bz2
mpv-6dfb85dc9ec79ec10e073e317566cfc0fbffb319.tar.xz
Our ALSA code needs alloca, so check for it in configure and include alloca.h
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27313 b3059339-0415-0410-9bf9-f77b7e298cf2
-rwxr-xr-xconfigure4
-rw-r--r--libao2/ao_alsa.c1
-rw-r--r--stream/ai_alsa.c1
-rw-r--r--stream/ai_alsa1x.c1
4 files changed, 7 insertions, 0 deletions
diff --git a/configure b/configure
index b364520a91..d8c0817433 100755
--- a/configure
+++ b/configure
@@ -5205,6 +5205,10 @@ fi
echores "$_openal"
echocheck "ALSA audio"
+if test "$_alloca" != yes ; then
+ _alsa=no
+ _res_comment="alloca missing"
+fi
if test "$_alsa" != no ; then
_alsa=no
cat > $TMPC << EOF
diff --git a/libao2/ao_alsa.c b/libao2/ao_alsa.c
index 0d925ce9e3..987713e6f9 100644
--- a/libao2/ao_alsa.c
+++ b/libao2/ao_alsa.c
@@ -19,6 +19,7 @@
#include <ctype.h>
#include <math.h>
#include <string.h>
+#include <alloca.h>
#include "config.h"
#include "subopt-helper.h"
diff --git a/stream/ai_alsa.c b/stream/ai_alsa.c
index a1468bed09..84d0aa58a4 100644
--- a/stream/ai_alsa.c
+++ b/stream/ai_alsa.c
@@ -1,6 +1,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <sys/time.h>
+#include <alloca.h>
#include "config.h"
diff --git a/stream/ai_alsa1x.c b/stream/ai_alsa1x.c
index 455c64191f..aab42e397b 100644
--- a/stream/ai_alsa1x.c
+++ b/stream/ai_alsa1x.c
@@ -1,6 +1,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <sys/time.h>
+#include <alloca.h>
#include "config.h"