--- rxvt-unicode/src/rxvt.h	2007/12/12 09:33:48	1.329
+++ rxvt-unicode/src/rxvt.h	2007/12/14 05:25:25	1.333
@@ -81,6 +81,19 @@
 # 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 */
+#endif
+
+#ifndef PATH_MAX
+# define PATH_MAX 16384
+#endif
+
 /****************************************************************************/
 
 // exception thrown on fatal (per-instance) errors
@@ -147,7 +160,6 @@
  * STRUCTURES AND TYPEDEFS
  *****************************************************************************
  */
-struct grwin_t;
 
 /* If we're using either the rxvt scrollbar, keep the
  * scrollColor resource.
@@ -215,17 +227,6 @@
 # define NO_MOUSE_REPORT_SCROLLBAR 1
 #endif
 
-/* now look for other badly set stuff */
-
-#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 */
-#endif
-
 #define scrollBar_esc           30
 
 #if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR) || defined(PLAIN_SCROLLBAR)
@@ -597,10 +598,6 @@
 #define CBUFSIZ                2048    // size of command buffer
 #define UBUFSIZ                2048    // character buffer
 
-#ifndef PATH_MAX
-# define PATH_MAX 16384
-#endif
-
 #if ENABLE_FRILLS
 # include <X11/Xmd.h>
 typedef struct _mwmhints {
@@ -1066,8 +1063,8 @@
 #endif
 
   void child_cb (ev::child &w, int revents); ev::child child_ev;
-  void prepare_cb (ev::prepare &w, int revents); ev::prepare prepare_ev;
   void destroy_cb (ev::idle &w, int revents); ev::idle destroy_ev;
+  void refresh_check ();
   void flush ();
   void flush_cb (ev::timer &w, int revents); ev::timer flush_ev;
   bool pty_fill ();
@@ -1104,10 +1101,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
@@ -1192,7 +1189,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);