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

Comparing rxvt-unicode/src/rxvtd.C (file contents):
Revision 1.47 by root, Mon Feb 2 22:38:40 2009 UTC vs.
Revision 1.51 by root, Sun Oct 24 17:34:47 2010 UTC

     }
   else
     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++)
     {
       if (!strcmp (argv [i], "-f") || !strcmp (argv [i], "--fork"))
     {
       pid = fork ();
     }
 #if ENABLE_MLOCK
-  // Optionally preform a mlockall so this process does not get swapped out.
+  // Optionally perform an mlockall so this process does not get swapped out.
-  if (opt_lock && pid == 0)
+  if (opt_lock && !pid)
-    if (mlockall(MCL_CURRENT | MCL_FUTURE) == -1)
+    if (mlockall (MCL_CURRENT | MCL_FUTURE) < 0)
-      perror("unable to lock into ram");
+      perror ("unable to lock into ram");
 #endif
   if (opt_fork)
     {
       if (pid < 0)
           return EXIT_FAILURE;
         }
       else if (pid > 0)
         _exit (EXIT_SUCCESS);
-      ev_default_fork ();
+      ev_loop_fork (EV_DEFAULT_UC);
     }
-  ev_loop (0);
+  ev_run ();
   return EXIT_SUCCESS;
 }

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