--- rxvt-unicode/src/rxvt.h	2007/11/30 01:26:32	1.327
+++ rxvt-unicode/src/rxvt.h	2007/12/13 16:41:47	1.331
@@ -147,7 +147,6 @@
  * STRUCTURES AND TYPEDEFS
  *****************************************************************************
  */
-struct grwin_t;
 
 /* If we're using either the rxvt scrollbar, keep the
  * scrollColor resource.
@@ -582,8 +581,6 @@
 #define PrivMode_LFNL		(1UL<<19)
 #define PrivMode_MouseBtnEvent  (1UL<<20)
 #define PrivMode_MouseAnyEvent  (1UL<<21)
-/* too annoying to implement X11 highlight tracking */
-/* #define PrivMode_MouseX11Track       (1LU<<20) */
 
 #define PrivMode_mouse_report   (PrivMode_MouseX10|PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent)
 
@@ -1106,10 +1103,10 @@
   void tt_write (const char *data, unsigned int len);
   void pty_write ();
 
-  bool init (stringvec *argv, stringvec *envv)
+  void init (stringvec *argv, stringvec *envv)
   {
     this->argv = argv;
-    return init (argv->size (), argv->begin (), envv);
+    init (argv->size (), argv->begin (), envv);
   }
 
   void make_current () const // make this the "currently active" urxvt instance
@@ -1175,7 +1172,7 @@
   void process_sgr_mode (unsigned int nargs, const int *arg);
   void process_graphics ();
   // init.C
-  bool init_vars ();
+  void init_vars ();
   void init_secondary ();
   const char **init_resources (int argc, const char *const *argv);
   void init_env ();
@@ -1194,7 +1191,7 @@
   ~rxvt_term ();
   void destroy ();
   void emergency_cleanup ();
-  bool init (int argc, const char *const *argv, stringvec *envv);
+  void init (int argc, const char *const *argv, stringvec *envv);
   void recolour_cursor ();
   void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent);
   void window_calc (unsigned int newwidth, unsigned int newheight);