--- rxvt-unicode/src/rxvtlib.h.in	2006/01/29 20:51:28	1.73
+++ rxvt-unicode/src/rxvtlib.h.in	2007/12/11 09:10:56	1.80
@@ -11,7 +11,6 @@
 @include_unistd_h@
 @include_string_h@
 @include_fcntl_h@
-@include_util_h@
 @include_assert_h@
 @include_sys_ioctl_h@
 @include_sys_time_h@
@@ -30,6 +29,8 @@
 // stdlib.h might provide it
 #endif
 
+using namespace std;
+
 extern "C" {
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
@@ -45,11 +46,6 @@
 @rxvt_int32_typedef@
 @rxvt_uint32_typedef@
 
-/* whatever normal size corresponds to a integer pointer */
-@rxvt_intp_define@
-/* whatever normal size corresponds to a unsigned integer pointer */
-@rxvt_u_intp_define@
-
 struct rxvt_fontset;
 struct rxvt_color;
 struct rxvt_vars;               /* defined later on */
@@ -101,7 +97,7 @@
  *  |························= row_buf[2] etc.
  *  |
  *  +------------+···········= term_start + top_row
- *  | scrollback |                                      
+ *  | scrollback |
  *  | scrollback +---------+·= term_start + view_start
  *  | scrollback | display |
  *  | scrollback | display |
@@ -186,7 +182,7 @@
   unsigned int      screen;     /* screen being used                         */
   unsigned int      clicks;     /* number of clicks                          */
   selection_op_t    op;         /* current operation                         */
-  bool              rect;       /* rectangluar selection?                    */
+  bool              rect;       /* rectangular selection?                    */
   row_col_t         beg;        /* beginning of selection   <= mark          */
   row_col_t         mark;       /* point of initial click   <= end           */
   row_col_t         end;        /* one character past end point              */
@@ -204,11 +200,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 +230,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;