diff --git a/include/common/compat.h b/include/common/compat.h index 05701c1de..34fbac5db 100644 --- a/include/common/compat.h +++ b/include/common/compat.h @@ -58,6 +58,14 @@ typedef struct { } empty_t; #define BITS_PER_INT (8*sizeof(int)) #endif +#ifndef MIN +#define MIN(a, b) (((a) < (b)) ? (a) : (b)) +#endif + +#ifndef MAX +#define MAX(a, b) (((a) > (b)) ? (a) : (b)) +#endif + /* this is for libc5 for example */ #ifndef TCP_NODELAY #define TCP_NODELAY 1 diff --git a/include/common/tools.h b/include/common/tools.h index c7c0c8869..8db38c6b4 100644 --- a/include/common/tools.h +++ b/include/common/tools.h @@ -22,16 +22,6 @@ #ifndef _COMMON_TOOLS_H #define _COMMON_TOOLS_H -#include - -#ifndef MIN -#define MIN(a, b) (((a) < (b)) ? (a) : (b)) -#endif - -#ifndef MAX -#define MAX(a, b) (((a) > (b)) ? (a) : (b)) -#endif - #define SWAP(a, b) do { typeof(a) t; t = a; a = b; b = t; } while(0) /* return an integer of type with only the highest bit set. may be