--- rxvt-unicode/src/rxvtd.C	2009/02/02 22:38:40	1.47
+++ rxvt-unicode/src/rxvtd.C	2010/10/22 05:58:00	1.50
@@ -224,14 +224,14 @@
     return err ();
 }
 
-int opt_fork, opt_opendisplay, opt_quiet;
-#if ENABLE_MLOCK
-int opt_lock;
-#endif
-
 int
 main (int argc, const char *const *argv)
 {
+  int opt_fork, opt_opendisplay, opt_quiet;
+#if ENABLE_MLOCK
+  int opt_lock;
+#endif
+
   rxvt_init ();
 
   for (int i = 1; i < argc; i++)
@@ -278,10 +278,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)
@@ -297,7 +297,7 @@
       ev_default_fork ();
     }
 
-  ev_loop (0);
+  ev_run ();
 
   return EXIT_SUCCESS;
 }