summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2015-05-31 12:37:01 +0200
committer Miodrag Milanovic <mmicko@gmail.com>2015-05-31 12:37:01 +0200
commitf23ff0f6f05eb62bb34ab00f9dce1a697a38a877 (patch)
tree78b64de305f6eccd87aae8e213f9340e1343eda0
parent2923224b5145191960a03674e297e11342b765c5 (diff)
fix compile on GCC 4.4 on old Ubuntu (nw)
-rw-r--r--3rdparty/portaudio/src/hostapi/alsa/pa_linux_alsa.c6
-rw-r--r--scripts/src/3rdparty.lua2
2 files changed, 4 insertions, 4 deletions
diff --git a/3rdparty/portaudio/src/hostapi/alsa/pa_linux_alsa.c b/3rdparty/portaudio/src/hostapi/alsa/pa_linux_alsa.c
index d73f5262420..628a03e7b0f 100644
--- a/3rdparty/portaudio/src/hostapi/alsa/pa_linux_alsa.c
+++ b/3rdparty/portaudio/src/hostapi/alsa/pa_linux_alsa.c
@@ -3697,7 +3697,7 @@ static PaError PaAlsaStream_GetAvailableFrames( PaAlsaStream *self, int queryCap
*available, int *xrunOccurred )
{
PaError result = paNoError;
- unsigned long captureFrames, playbackFrames;
+ unsigned long captureFrames = 0, playbackFrames = 0;
*xrunOccurred = 0;
assert( queryCapture || queryPlayback );
@@ -4579,7 +4579,7 @@ error:
PaError PaAlsa_GetStreamInputCard( PaStream* s, int* card )
{
- PaAlsaStream *stream;
+ PaAlsaStream *stream = NULL;
PaError result = paNoError;
snd_pcm_info_t* pcmInfo;
@@ -4598,7 +4598,7 @@ error:
PaError PaAlsa_GetStreamOutputCard( PaStream* s, int* card )
{
- PaAlsaStream *stream;
+ PaAlsaStream *stream = NULL;
PaError result = paNoError;
snd_pcm_info_t* pcmInfo;
diff --git a/scripts/src/3rdparty.lua b/scripts/src/3rdparty.lua
index dd53fa8105e..34c9a14599c 100644
--- a/scripts/src/3rdparty.lua
+++ b/scripts/src/3rdparty.lua
@@ -637,7 +637,7 @@ project "portaudio"
"-Wno-sometimes-uninitialized",
}
else
- if (version >= 40400) then
+ if (version >= 40600) then
buildoptions_c {
"-Wno-unused-but-set-variable",
"-Wno-maybe-uninitialized",