diff options
| -rw-r--r-- | Alc/mixer.c | 2 | ||||
| -rw-r--r-- | OpenAL32/Include/alMain.h | 3 | ||||
| -rw-r--r-- | OpenAL32/Include/alu.h | 8 |
3 files changed, 1 insertions, 12 deletions
diff --git a/Alc/mixer.c b/Alc/mixer.c index b589593f..a4197341 100644 --- a/Alc/mixer.c +++ b/Alc/mixer.c @@ -592,7 +592,7 @@ ALvoid MixSource(ALsource *Source, ALCdevice *Device, ALuint SamplesToDo) DataSize64 += BufferPadding+BufferPrePadding; DataSize64 *= FrameSize; - BufferSize = min(DataSize64, STACK_DATA_SIZE); + BufferSize = ((DataSize64 > STACK_DATA_SIZE) ? STACK_DATA_SIZE : DataSize64); BufferSize -= BufferSize%FrameSize; if(Source->lSourceType == AL_STATIC) diff --git a/OpenAL32/Include/alMain.h b/OpenAL32/Include/alMain.h index 73b314fe..5873feb1 100644 --- a/OpenAL32/Include/alMain.h +++ b/OpenAL32/Include/alMain.h @@ -216,9 +216,6 @@ static __inline void Sleep(ALuint t) tv = rem; } -#define min(x,y) (((x)<(y))?(x):(y)) -#define max(x,y) (((x)>(y))?(x):(y)) - #if defined(HAVE_DLFCN_H) #define HAVE_DYNLOAD 1 void *LoadLib(const char *name); diff --git a/OpenAL32/Include/alu.h b/OpenAL32/Include/alu.h index bddc2cf8..216c2e14 100644 --- a/OpenAL32/Include/alu.h +++ b/OpenAL32/Include/alu.h @@ -49,14 +49,6 @@ #define aluFabs(x) ((ALfloat)fabs((double)(x))) #endif -// fixes for mingw32. -#if defined(max) && !defined(__max) -#define __max max -#endif -#if defined(min) && !defined(__min) -#define __min min -#endif - #define QUADRANT_NUM 128 #define LUT_NUM (4 * QUADRANT_NUM) |