*** empty log message ***

[software/libev.git] / ev.c

diff --git a/ev.c b/ev.c
index 207ecd1ee5851542364d88cd3d330db4faa7f1a7..2c341411f0006e487d71153f08097eb87e6219f5 100644 (file)
--- a/ev.c
+++ b/ev.c
@@ -748,7 +748,7 @@ enable_secure (void)
 #endif
 }
 
 #endif
 }
 

-int
+unsigned int

 ev_method (EV_P)
 {
   return method;
 ev_method (EV_P)
 {
   return method;


@@ -772,7 +772,7 @@ loop_init (EV_P_ unsigned int flags)
       now_floor = mn_now;
       rtmn_diff = ev_rt_now - mn_now;
 
       now_floor = mn_now;
       rtmn_diff = ev_rt_now - mn_now;
 

-      if (!(flags & EVMETHOD_NOENV) && !enable_secure () && getenv ("LIBEV_FLAGS"))
+      if (!(flags & EVFLAG_NOENV) && !enable_secure () && getenv ("LIBEV_FLAGS"))

         flags = atoi (getenv ("LIBEV_FLAGS"));
 
       if (!(flags & 0x0000ffff))
         flags = atoi (getenv ("LIBEV_FLAGS"));
 
       if (!(flags & 0x0000ffff))


@@ -909,7 +909,7 @@ ev_default_loop (unsigned int flags)
       default_loop = 1;
 #endif
 
       default_loop = 1;
 #endif
 

-      loop_init (EV_A_ methods);
+      loop_init (EV_A_ flags);

 
       if (ev_method (EV_A))
         {
 
       if (ev_method (EV_A))
         {


@@ -1384,7 +1384,10 @@ ev_timer_again (EV_P_ struct ev_timer *w)
         ev_timer_stop (EV_A_ w);
     }
   else if (w->repeat)
         ev_timer_stop (EV_A_ w);
     }
   else if (w->repeat)

-    ev_timer_start (EV_A_ w);
+    {
+      w->at = w->repeat;
+      ev_timer_start (EV_A_ w);
+    }

 }
 
 #if EV_PERIODICS
 }
 
 #if EV_PERIODICS