From 38a4d9a6c5f312fc37418c21b416cc3f8c379205 Mon Sep 17 00:00:00 2001 From: Chris Robinson Date: Tue, 16 Aug 2011 18:53:04 -0700 Subject: Get rid of the remaining min/max usage --- OpenAL32/Include/alMain.h | 3 --- OpenAL32/Include/alu.h | 8 -------- 2 files changed, 11 deletions(-) (limited to 'OpenAL32/Include') 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) -- cgit v1.2.3