1 --- ./include/my_global.h.org 2007-04-16 15:21:49.919125205 +0200
2 +++ ./include/my_global.h 2007-04-16 15:23:56.166608710 +0200
6 /* Define some useful general macros */
8 -#define max(a, b) ((a) > (b) ? (a) : (b))
9 -#define min(a, b) ((a) < (b) ? (a) : (b))
10 +#if !defined(mysql_max)
11 +static __inline long min( long a, long b ) { return ( ( a < b ) ? a : b ); }
12 +static __inline long max( long a, long b ) { return ( ( a > b ) ? a : b ); }
15 #if !defined(HAVE_UINT)