--- rxvt-unicode/src/rxvttoolkit.C	2007/10/31 09:55:24	1.73
+++ rxvt-unicode/src/rxvttoolkit.C	2007/11/11 18:05:19	1.76
@@ -185,7 +185,7 @@
   ximcallback.client_data = (XPointer)this;
   ximcallback.callback = im_destroy_cb;
 
-  XSetIMValues (xim, XNDestroyCallback, &ximcallback, 0);
+  XSetIMValues (xim, XNDestroyCallback, &ximcallback, (char *)0);
 
   return true;
 }
@@ -464,7 +464,7 @@
   int fd = XConnectionNumber (dpy);
 
   // try to detect wether we have a local connection.
-  // assume unix domains socket == local, everything else not
+  // assume unix domain socket == local, everything else not
   // TODO: might want to check for inet/127.0.0.1
   is_local = 0;
   sockaddr_un sa;
@@ -473,7 +473,7 @@
   if (!getsockname (fd, (sockaddr *)&sa, &sl))
     is_local = sa.sun_family == AF_UNIX;
 
-  x_ev.start (fd, EVENT_READ);
+  x_ev.start (fd, ev::READ);
   fcntl (fd, F_SETFD, FD_CLOEXEC);
 
   XSelectInput (dpy, root, PropertyChangeMask);
@@ -540,7 +540,7 @@
 }
 #endif
 
-void rxvt_display::x_cb (io_watcher &w, short revents)
+void rxvt_display::x_cb (ev::io &w, int revents)
 {
   do
     {
@@ -577,7 +577,7 @@
 void rxvt_display::flush ()
 {
   if (XEventsQueued (dpy, QueuedAlready))
-    x_cb (x_ev, EVENT_READ);
+    x_cb (x_ev, ev::READ);
 
   XFlush (dpy);
 }