--- rxvt-unicode/src/rxvtlib.h.in	2006/01/29 20:51:28	1.73
+++ rxvt-unicode/src/rxvtlib.h.in	2007/05/01 21:10:04	1.76
@@ -30,6 +30,8 @@
 // stdlib.h might provide it
 #endif
 
+using namespace std;
+
 extern "C" {
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
@@ -204,11 +206,12 @@
 
 /* rxvt_vars.options */
 enum {
-# define def(name,idx) Opt_ ## name = 1UL << (idx),
+# define def(name,idx) Opt_ ## name = idx,
 # define nodef(name)   Opt_ ## name = 0,
 # include "optinc.h"
 # undef nodef
 # undef def
+Opt_count
 };
 
 /* ------------------------------------------------------------------------- */
@@ -233,7 +236,7 @@
 
 struct rxvt_vars : TermWin_t {
   scrollBar_t     scrollBar;
-  uint32_t        options;
+  uint8_t         options[(Opt_count + 7) >> 3];
   XSizeHints      szHint;
   rxvt_color     *pix_colors;
   rxvt_color     *pix_colors_focused;