*** empty log message ***

[software/libev.git] / ev.c

diff --git a/ev.c b/ev.c
index 8fd359e648488f05044a52ca52d872cacfa7c705..00edbd2d2bcfc55696b2d2a678820b7203880976 100644 (file)
--- a/ev.c
+++ b/ev.c
@@ -128,7 +128,11 @@
 #define PID_HASHSIZE  16 /* size of pid hash table, must be power of two */
 /*#define CLEANUP_INTERVAL 300. /* how often to try to free memory and re-check fds */
 
 #define PID_HASHSIZE  16 /* size of pid hash table, must be power of two */
 /*#define CLEANUP_INTERVAL 300. /* how often to try to free memory and re-check fds */
 

-#include "ev.h"
+#ifdef EV_H
+# include EV_H
+#else
+# include "ev.h"
+#endif

 
 #if __GNUC__ >= 3
 # define expect(expr,value)         __builtin_expect ((expr),(value))
 
 #if __GNUC__ >= 3
 # define expect(expr,value)         __builtin_expect ((expr),(value))


@@ -749,7 +753,7 @@ loop_init (EV_P_ int methods)
       if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods);
 #endif
 
       if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods);
 #endif
 

-      ev_watcher_init (&sigev, sigcb);
+      ev_init (&sigev, sigcb);

       ev_set_priority (&sigev, EV_MAXPRI);
     }
 }
       ev_set_priority (&sigev, EV_MAXPRI);
     }
 }


@@ -946,7 +950,7 @@ call_pending (EV_P)
         if (p->w)
           {
             p->w->pending = 0;
         if (p->w)
           {
             p->w->pending = 0;

-            p->w->cb (EV_A_ p->w, p->events);
+            EV_CB_INVOKE (p->w, p->events);

           }
       }
 }
           }
       }
 }


@@ -1562,14 +1566,14 @@ ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, vo
       once->cb  = cb;
       once->arg = arg;
 
       once->cb  = cb;
       once->arg = arg;
 

-      ev_watcher_init (&once->io, once_cb_io);
+      ev_init (&once->io, once_cb_io);

       if (fd >= 0)
         {
           ev_io_set (&once->io, fd, events);
           ev_io_start (EV_A_ &once->io);
         }
 
       if (fd >= 0)
         {
           ev_io_set (&once->io, fd, events);
           ev_io_start (EV_A_ &once->io);
         }
 

-      ev_watcher_init (&once->to, once_cb_to);
+      ev_init (&once->to, once_cb_to);

       if (timeout >= 0.)
         {
           ev_timer_set (&once->to, timeout, 0.);
       if (timeout >= 0.)
         {
           ev_timer_set (&once->to, timeout, 0.);