--- deliantra/server/include/define.h 2007/11/08 19:43:24 1.77 +++ deliantra/server/include/define.h 2008/03/15 13:52:37 1.78 @@ -44,25 +44,12 @@ #ifdef __NetBSD__ # include #endif -#ifndef MIN -# define MIN(x,y) min (x, y) -#endif -#ifndef MAX -# define MAX(x,y) max (x, y) -#endif // maximum length of an object name in the protocol #define NAME_LEN 127 -/* MAX3 is basically like MAX, but instead does 3 values. */ -#ifndef MAX3 -# define MAX3(x,y, z) (MAX(x, MAX(y,z))) -#endif - -/* MIN3 is basically like MIN, but instead does 3 values. */ -#ifndef MIN3 -# define MIN3(x,y, z) (MIN(x, MIN(y,z))) -#endif +#undef MIN +#undef MAX #define MAX_STAT 30 /* The maximum legal value of any stat */ #define MIN_STAT 1 /* The minimum legal value of any stat */