Use #if !EV_MULTIPLICITY instead of #ifndef because it should be defined always.

[software/libev.git] / ev.c

diff --git a/ev.c b/ev.c
index a60ba0dbfd38de9328436a7ecfae881928a327b0..a14b940230d938559ee6e2b87b2eb0cac9a9357c 100644 (file)
--- a/ev.c
+++ b/ev.c
@@ -1168,6 +1168,7 @@ loop_fork (EV_P)
         syserr ("(libev) error creating pipe");
 
       siginit (EV_A);
         syserr ("(libev) error creating pipe");
 
       siginit (EV_A);

+      sigcb (EV_A_ &sigev, EV_READ);

     }
 
   postfork = 0;
     }
 
   postfork = 0;


@@ -1199,7 +1200,7 @@ ev_loop_destroy (EV_P)
 void
 ev_loop_fork (EV_P)
 {
 void
 ev_loop_fork (EV_P)
 {

-  postfork = 1;
+  postfork = 1; /* must be in line with ev_default_fork */

 }
 
 #endif
 }
 
 #endif


@@ -1273,7 +1274,7 @@ ev_default_fork (void)
 #endif
 
   if (backend)
 #endif
 
   if (backend)

-    postfork = 1;
+    postfork = 1; /* must be in line with ev_loop_fork */

 }
 
 /*****************************************************************************/
 }
 
 /*****************************************************************************/


@@ -1311,7 +1312,7 @@ timers_reify (EV_P)
     {
       ev_timer *w = (ev_timer *)timers [0];
 
     {
       ev_timer *w = (ev_timer *)timers [0];
 

-      assert (("inactive timer on timer heap detected", ev_is_active (w)));
+      /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/

 
       /* first reschedule or stop timer */
       if (w->repeat)
 
       /* first reschedule or stop timer */
       if (w->repeat)