--- rxvt-unicode/src/rxvtd.C	2009/02/02 22:38:40	1.47
+++ rxvt-unicode/src/rxvtd.C	2010/10/24 17:52:50	1.52
@@ -224,15 +224,15 @@
     return err ();
 }
 
-int opt_fork, opt_opendisplay, opt_quiet;
-#if ENABLE_MLOCK
-int opt_lock;
-#endif
-
 int
 main (int argc, const char *const *argv)
 {
-  rxvt_init ();
+  ptytty::init ();
+
+  int opt_fork, opt_opendisplay, opt_quiet;
+#if ENABLE_MLOCK
+  int opt_lock;
+#endif
 
   for (int i = 1; i < argc; i++)
     {
@@ -253,6 +253,8 @@
         }
     }
 
+  rxvt_init ();
+
   // optionally open display and never release it.
   if (opt_opendisplay)
     if (const char *dpy = getenv ("DISPLAY"))
@@ -278,10 +280,10 @@
     }
 
 #if ENABLE_MLOCK
-  // Optionally preform a mlockall so this process does not get swapped out.
-  if (opt_lock && pid == 0)
-    if (mlockall(MCL_CURRENT | MCL_FUTURE) == -1)
-      perror("unable to lock into ram");
+  // Optionally perform an mlockall so this process does not get swapped out.
+  if (opt_lock && !pid)
+    if (mlockall (MCL_CURRENT | MCL_FUTURE) < 0)
+      perror ("unable to lock into ram");
 #endif
 
   if (opt_fork)
@@ -294,10 +296,10 @@
       else if (pid > 0)
         _exit (EXIT_SUCCESS);
 
-      ev_default_fork ();
+      ev_loop_fork (EV_DEFAULT_UC);
     }
 
-  ev_loop (0);
+  ev_run ();
 
   return EXIT_SUCCESS;
 }