[ViewVC] Diff of: cvs/libev/ev.c

Comparing libev/ev.c (file contents):
Revision 1.320 by root, Fri Dec 4 20:25:06 2009 UTC vs.
Revision 1.321 by root, Thu Dec 31 06:50:17 2009 UTC

 #endif
 #if EV_USE_INOTIFY
       fs_fd             = flags & EVFLAG_NOINOTIFY ? -1 : -2;
 #endif
 #if EV_USE_SIGNALFD
-      sigfd             = flags & EVFLAG_NOSIGFD   ? -1 : -2;
+      sigfd             = flags & EVFLAG_SIGNALFD  ? -2 : -1;
 #endif
       if (!(flags & 0x0000ffffU))
         flags |= ev_recommended_backends ();
       signals [w->signum - 1].loop = 0; /* unattach from signal */
 #endif
 #if EV_USE_SIGNALFD
       if (sigfd >= 0)
         {
-          sigprocmask (SIG_UNBLOCK, &sigfd_set, 0);//D
+          sigset_t ss;
+          sigemptyset (&ss);
+          sigaddset (&ss, w->signum);
           sigdelset (&sigfd_set, w->signum);
           signalfd (sigfd, &sigfd_set, 0);
-          sigprocmask (SIG_BLOCK, &sigfd_set, 0);//D
+          sigprocmask (SIG_UNBLOCK, &ss, 0);
-          /*TODO: maybe unblock signal? */
         }
       else
 #endif
         signal (w->signum, SIG_DFL);
     }

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