From e8a54efe414d9d25b71cef910b15935bea8c530e Mon Sep 17 00:00:00 2001
From: Eric Wong <normalperson@yhbt.net>
Date: Sat, 19 Nov 2005 10:29:20 +0000
Subject: gcc 2.95 fixes

audioOutput_osx.c, aac_decode.c, mp4_decode.c have NOT been thoroughly
checked, but I nevertheless managed to eyeball and fix one
incompatibility in audioOutput_osx.c

All other files have been build successfully with gcc 2.95


git-svn-id: https://svn.musicpd.org/mpd/trunk@3688 09075e82-0dd4-0310-85a5-a0d7c8717e4f
---
 src/audioOutputs/audioOutput_alsa.c | 5 +++--
 src/audioOutputs/audioOutput_mvp.c  | 2 +-
 src/audioOutputs/audioOutput_oss.c  | 3 ++-
 src/audioOutputs/audioOutput_osx.c  | 3 ++-
 src/decode.c                        | 2 +-
 5 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/audioOutputs/audioOutput_alsa.c b/src/audioOutputs/audioOutput_alsa.c
index 61c7670a2..e3378143e 100644
--- a/src/audioOutputs/audioOutput_alsa.c
+++ b/src/audioOutputs/audioOutput_alsa.c
@@ -70,10 +70,11 @@ static void freeAlsaData(AlsaData * ad) {
 
 static int alsa_initDriver(AudioOutput * audioOutput, ConfigParam * param) {
 	BlockParam * bp = NULL;
-
+	AlsaData * ad;
+	
 	if(param) bp = getBlockParam(param, "device");
 
-	AlsaData * ad = newAlsaData();
+	ad = newAlsaData();
 	
 	audioOutput->data = ad;
 
diff --git a/src/audioOutputs/audioOutput_mvp.c b/src/audioOutputs/audioOutput_mvp.c
index 54f3b4327..4f60fb595 100644
--- a/src/audioOutputs/audioOutput_mvp.c
+++ b/src/audioOutputs/audioOutput_mvp.c
@@ -187,6 +187,7 @@ static int mvp_setPcmParams(MvpData *md, unsigned long rate, int channels, int b
 static int mvp_openDevice(AudioOutput * audioOutput) 
 {
    int ret = -1;
+   long long int stc = 0;
    MvpData * md = audioOutput->data;
    AudioFormat * audioFormat = &audioOutput->outAudioFormat;
    int mix[5] = { 0, 2, 7, 1, 0 };
@@ -208,7 +209,6 @@ static int mvp_openDevice(AudioOutput * audioOutput)
       ERROR("Error setting audio format: %s\n", strerror(errno));
       return -1;
    }
-   long long int stc = 0;
    ioctl(md->fd, MVP_SET_AUD_STC, &stc);
    if (ioctl(md->fd, MVP_SET_AUD_BYPASS, 1) < 0){
       ERROR("Error setting audio streamtype: %s\n", strerror(errno));
diff --git a/src/audioOutputs/audioOutput_oss.c b/src/audioOutputs/audioOutput_oss.c
index ad5b93f6b..6cfb4f18f 100644
--- a/src/audioOutputs/audioOutput_oss.c
+++ b/src/audioOutputs/audioOutput_oss.c
@@ -319,10 +319,11 @@ static int oss_testDefault() {
 
 static int oss_initDriver(AudioOutput * audioOutput, ConfigParam * param) {
 	BlockParam * bp = NULL;
+	OssData * od;
 
 	if(param) bp = getBlockParam(param, "device");
 
-	OssData * od = newOssData();
+	od = newOssData();
 	audioOutput->data = od;
 
 	if(!bp) {
diff --git a/src/audioOutputs/audioOutput_osx.c b/src/audioOutputs/audioOutput_osx.c
index 00beaef33..191edebd5 100644
--- a/src/audioOutputs/audioOutput_osx.c
+++ b/src/audioOutputs/audioOutput_osx.c
@@ -291,8 +291,9 @@ static int osx_play(AudioOutput * audioOutput, char * playChunk, int size) {
 	//DEBUG("osx_play: enter\n");
 
 	if(!od->started) {
+		int err;
 		od->started = 1;
-		int err = AudioOutputUnitStart(od->au);
+		err = AudioOutputUnitStart(od->au);
 		if(err) {
 			ERROR("unable to start audio output: %i\n", err);
 			return -1;
diff --git a/src/decode.c b/src/decode.c
index 9af2c7e4f..34904a4c9 100644
--- a/src/decode.c
+++ b/src/decode.c
@@ -145,9 +145,9 @@ int calculateCrossFadeChunks(PlayerControl * pc, AudioFormat * af) {
 int waitOnDecode(PlayerControl * pc, DecoderControl * dc, OutputBuffer * cb,
                 int * decodeWaitedOn) 
 {
+	MpdTag * tag = NULL;
         strncpy(pc->currentUrl, pc->utf8url, MAXPATHLEN);
         pc->currentUrl[MAXPATHLEN] = '\0';
-	MpdTag * tag = NULL;
 
 	while(decode_pid>0 && dc->start) my_usleep(10000);
 
-- 
cgit v1.2.3