--- rxvt-unicode/src/command.C	2006/01/31 18:36:35	1.298
+++ rxvt-unicode/src/command.C	2006/01/31 21:35:39	1.302
@@ -51,11 +51,6 @@
 #include "version.h"
 #include "command.h"
 
-#if HAVE_SCHED_YIELD
-#undef HAVE_SCHED_YIELD // disabled for the time being
-//# include <sched.h>
-#endif
-
 #ifdef KEYSYM_RESOURCE
 # include "keyboard.h"
 #endif
@@ -1097,19 +1092,19 @@
 }
 #endif
 
-#if HAVE_SCHED_YIELD
+#if LINUX_YIELD_HACK
 static struct event_handler
 {
-  check_watcher cw_yield;
+  check_watcher yield_ev;
   
-  void yield (check_watcher &w)
+  void yield_cb (check_watcher &w)
   {
-    sched_yield ();
+    usleep (0);
     w.stop ();
   }
 
   event_handler ()
-  : cw_yield (this, &event_handler::yield)
+  : yield_ev (this, &event_handler::yield_cb)
   {
   }
 } event_handler;
@@ -1139,9 +1134,9 @@
     }
   else if (r < 0 && (errno == EAGAIN || errno == EINTR))
     {
-#if HAVE_SCHED_YIELD
+#if LINUX_YIELD_HACK
       if (display->is_local)
-        event_handler.cw_yield.start ();
+        event_handler.yield_ev.start ();
 #endif
     }
   else
@@ -2543,7 +2538,7 @@
               int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
 
               rgba c;
-              pix_colors_focused [Color_tint].get (this, c);
+              pix_colors_focused [Color_tint].get (c);
 
               ShadeXImage (this, image, shade, c.r, c.g, c.b);
             }
@@ -3574,7 +3569,6 @@
                            (unsigned int) (args[1] * fheight));
         break;
 
-
       /*
        * reports - some output format copied from XTerm
        */
@@ -3722,7 +3716,7 @@
   if (str[0] == '?' && !str[1])
     {
       rgba c;
-      pix_colors_focused[color].get (this, c);
+      pix_colors_focused[color].get (c);
 
 #if XFT
       if (c.a != rgba::MAX_CC)