[ViewVC] Diff of: cvs/rxvt-unicode/src/main.C

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.270 by root, Tue Dec 4 16:24:00 2007 UTC vs.
Revision 1.273 by ayin, Tue Dec 11 11:39:06 2007 UTC

 #include <limits>
 #include <csignal>
 #include <cstring>
-#ifdef HAVE_TERMIOS_H
 # include <termios.h>
-#endif
 #ifdef HAVE_XSETLOCALE
 # define X_LOCALE
 # include <X11/Xlocale.h>
 #else
 }
 void
 rxvt_term::destroy ()
 {
-  if (destroy_ev.active)
+  if (ev_is_active (&destroy_ev))
     return;
   HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
 #if ENABLE_OVERLAY
   ev::sig sw_term, sw_int;
   /*
    * Catch a fatal signal and tidy up before quitting
    */
-  void
-  sig_term (ev::sig &w, int revents)
+  void sig_term (ev::sig &w, int revents);
-  {
-    rxvt_emergency_cleanup ();
-    w.stop ();
-    kill (getpid (), w.signum);
-  }
   sig_handlers ()
   {
     sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
     sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
   }
 } sig_handlers;
+void
+sig_handlers::sig_term (ev::sig &w, int revents)
+{
+  rxvt_emergency_cleanup ();
+  w.stop ();
+  kill (getpid (), w.signum);
+}
 char **rxvt_environ; // startup environment
 void
 rxvt_init ()

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines