--- rxvt-unicode/src/rxvt.h	2010/01/24 21:53:13	1.380
+++ rxvt-unicode/src/rxvt.h	2010/03/30 22:46:25	1.382
@@ -114,10 +114,6 @@
 # define STDERR_FILENO  2
 #endif
 
-#if !defined (EACCESS) && defined(EAGAIN)
-# define EACCESS EAGAIN
-#endif
-
 #ifndef EXIT_SUCCESS            /* missing from <stdlib.h> */
 # define EXIT_SUCCESS           0       /* exit function success */
 # define EXIT_FAILURE           1       /* exit function failure */
@@ -342,7 +338,7 @@
 #define RS_baseattrMask         (RS_Italic | RS_Bold | RS_Blink | RS_RVid | RS_Uline)
 #define RS_attrMask             (RS_baseattrMask | RS_fontMask)
 
-#define RS_fontCount		127		// not 128 or 256, see rxvtfont.h
+#define RS_fontCount		rxvt_fontset::fontCount
 #define RS_fontMask             0xff000000UL    // plenty(?) of fonts, includes RS_Careful
 #define RS_fontShift            24