# HG changeset patch # User michaelni # Date 1036183030 0 # Node ID 5344ecb2c677649046fd56dc938f058200ee3828 # Parent 21d400c67fc580bcf869a175e676853944aa0af1 put MIN/MAX under ifndef MAX/MIN diff -r 21d400c67fc5 -r 5344ecb2c677 common.h --- a/common.h Fri Nov 01 18:55:03 2002 +0000 +++ b/common.h Fri Nov 01 20:37:10 2002 +0000 @@ -162,8 +162,14 @@ /* assume b>0 */ #define ROUNDED_DIV(a,b) (((a)>0 ? (a) + ((b)>>1) : (a) - ((b)>>1))/(b)) #define ABS(a) ((a) >= 0 ? (a) : (-(a))) -#define MAX(a,b) ((a) > (b) ? (a) : (b)) -#define MIN(a,b) ((a) > (b) ? (b) : (a)) + +#ifndef MAX +# define MAX(a,b) ((a) > (b) ? (a) : (b)) +#endif + +#ifndef MIN +# define MIN(a,b) ((a) > (b) ? (b) : (a)) +#endif #ifdef ARCH_X86 // avoid +32 for shift optimization (gcc should do that ...)