--- rxvt-unicode/src/rxvtutil.h	2005/06/26 19:59:29	1.9
+++ rxvt-unicode/src/rxvtutil.h	2005/12/20 19:30:59	1.11
@@ -15,15 +15,20 @@
 } byteorder;
 
 template<typename T, typename U>
-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<typename T, typename U>
-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<typename T>
 static inline void swap (T& a, T& b) { T t=a; a=b; b=t; }
 
-#define IN_RANGE(val,beg,end) \
+// in range including end
+#define IN_RANGE_INC(val,beg,end) \
   ((unsigned int)(val) - (unsigned int)(beg) <= (unsigned int)(end) - (unsigned int)(beg))
 
+// in range excluding end
+#define IN_RANGE_EXC(val,beg,end) \
+  ((unsigned int)(val) - (unsigned int)(beg) <  (unsigned int)(end) - (unsigned int)(beg))
+
 struct zero_initialized {
   void *operator new (size_t s);
   void operator delete (void *p, size_t s);