--- rxvt-unicode/src/rxvtutil.h 2005/01/16 15:59:45 1.8 +++ rxvt-unicode/src/rxvtutil.h 2005/11/28 19:35:04 1.10 @@ -15,12 +15,14 @@ } byteorder; template -static inline T min (T a, U b) { return a < b ? a : (T)b; } +static inline T min (T a, U b) { return a < (T)b ? a : (T)b; } template -static inline T max (T a, U b) { return a > b ? a : (T)b; } +static inline T max (T a, U b) { return a > (T)b ? a : (T)b; } template static inline void swap (T& a, T& b) { T t=a; a=b; b=t; } +#define IN_RANGE(val,beg,end) \ + ((unsigned int)(val) - (unsigned int)(beg) <= (unsigned int)(end) - (unsigned int)(beg)) struct zero_initialized { void *operator new (size_t s);