--- rxvt-unicode/src/rxvt.h	2010/03/31 23:49:08	1.390
+++ rxvt-unicode/src/rxvt.h	2010/04/01 00:14:25	1.393
@@ -308,9 +308,9 @@
 
 #define RS_None                 0
 
-#define RS_colorMask		0x0000007fUL	// 128 colors
-#define RS_fgShift		0
-#define RS_bgShift		Color_Bits
+#define RS_colorMask		((1UL << Color_Bits) - 1UL)
+#define RS_fgShift		Color_Bits
+#define RS_bgShift		0
 #define RS_fgMask               (RS_colorMask << RS_fgShift)
 #define RS_bgMask               (RS_colorMask << RS_bgShift)
 
@@ -460,7 +460,7 @@
   Color_White = maxCOLOR,
 #endif
   minTermCOLOR = Color_White + 1,
-#ifndef XTERM_256_COLORS
+#ifndef USE_256_COLORS
   maxTermCOLOR = Color_White + 72,
 #else
   maxTermCOLOR = Color_White + 240,
@@ -504,7 +504,7 @@
 #endif
 };
 
-#ifndef XTERM_256_COLORS
+#ifndef USE_256_COLORS
 #define Color_Bits      7 // 0 .. maxTermCOLOR
 #else
 #define Color_Bits      9 // 0 .. maxTermCOLOR