*** empty log message ***

[software/libev.git] / ev.c

diff --git a/ev.c b/ev.c
index 08d4c7ac3b59a6ac3e0efb02772e5ace3b4676a2..32369d3de5e24a995a6a905fdfcbd0a4ec402375 100644 (file)
--- a/ev.c
+++ b/ev.c
@@ -1047,10 +1047,12 @@ loop_destroy (EV_P)
   array_free (timer, EMPTY);
 #if EV_PERIODIC_ENABLE
   array_free (periodic, EMPTY);
   array_free (timer, EMPTY);
 #if EV_PERIODIC_ENABLE
   array_free (periodic, EMPTY);

+#endif
+#if EV_FORK_ENABLE
+  array_free (fork, EMPTY);

 #endif
   array_free (prepare, EMPTY);
   array_free (check, EMPTY);
 #endif
   array_free (prepare, EMPTY);
   array_free (check, EMPTY);

-  array_free (fork, EMPTY);

 
   backend = 0;
 }
 
   backend = 0;
 }


@@ -2182,7 +2184,7 @@ ev_check_stop (EV_P_ ev_check *w)
 void noinline
 ev_embed_sweep (EV_P_ ev_embed *w)
 {
 void noinline
 ev_embed_sweep (EV_P_ ev_embed *w)
 {

-  ev_loop (w->loop, EVLOOP_NONBLOCK);
+  ev_loop (w->other, EVLOOP_NONBLOCK);

 }
 
 static void
 }
 
 static void


@@ -2203,7 +2205,7 @@ ev_embed_start (EV_P_ ev_embed *w)
     return;
 
   {
     return;
 
   {

-    struct ev_loop *loop = w->loop;
+    struct ev_loop *loop = w->other;

     assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
     ev_io_init (&w->io, embed_cb, backend_fd, EV_READ);
   }
     assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
     ev_io_init (&w->io, embed_cb, backend_fd, EV_READ);
   }


@@ -2320,6 +2322,10 @@ ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, vo
     }
 }
 
     }
 }
 

+#if EV_MULTIPLICITY
+  #include "ev_wrap.h"
+#endif
+

 #ifdef __cplusplus
 }
 #endif
 #ifdef __cplusplus
 }
 #endif