From 517bb2aa50369eee8eb4010e47239625a1963b87 Mon Sep 17 00:00:00 2001 From: plagman Date: Sun, 16 Jan 2011 07:20:11 +0000 Subject: [PATCH] Don't use -rdynamic on platforms that don't necessarily support it. git-svn-id: https://svn.eduke32.com/eduke32@1771 1a8010ca-5511-0410-912e-c29ae57300e0 --- polymer/eduke32/source/jaudiolib/src/vorbis.c | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/polymer/eduke32/source/jaudiolib/src/vorbis.c b/polymer/eduke32/source/jaudiolib/src/vorbis.c index eb81dc460..0115e1857 100644 --- a/polymer/eduke32/source/jaudiolib/src/vorbis.c +++ b/polymer/eduke32/source/jaudiolib/src/vorbis.c @@ -24,6 +24,8 @@ #ifdef HAVE_VORBIS +#define OV_EXCLUDE_STATIC_CALLBACKS + #ifdef __APPLE__ # include #else @@ -41,12 +43,12 @@ #include "multivoc.h" #include "_multivc.h" -#ifndef min -#define min(x,y) ((x) < (y) ? (x) : (y)) -#endif -#ifndef max -#define max(x,y) ((x) > (y) ? (x) : (y)) -#endif +#ifndef min +#define min(x,y) ((x) < (y) ? (x) : (y)) +#endif +#ifndef max +#define max(x,y) ((x) > (y) ? (x) : (y)) +#endif #define BLOCKSIZE 0x8000 @@ -80,9 +82,9 @@ static size_t read_vorbis(void * ptr, size_t size, size_t nmemb, void * datasour bytes = size; } - memcpy(ptr, (uint8_t *)vorb->ptr + vorb->pos, bytes); - vorb->pos += bytes; - ptr = (uint8_t *)ptr + bytes; + memcpy(ptr, (uint8_t *)vorb->ptr + vorb->pos, bytes); + vorb->pos += bytes; + ptr = (uint8_t *)ptr + bytes; if (vorb->length == vorb->pos) { nread++; @@ -193,7 +195,7 @@ static playbackstatus MV_GetNextVorbisBlock voice->channels = vi->channels; voice->SamplingRate = vi->rate; voice->RateScale = ( voice->SamplingRate * voice->PitchScale ) / MV_MixRate; - voice->FixedPointBufferSize = ( voice->RateScale * MixBufferSize ) - voice->RateScale; + voice->FixedPointBufferSize = ( voice->RateScale * MixBufferSize ) - voice->RateScale; MV_SetVoiceMixMode( voice ); vd->lastbitstream = bitstream; }