[ViewVC] Diff of: cvs/libev/event.h

Comparing libev/event.h (file contents):
Revision 1.4 by root, Fri Nov 2 13:08:51 2007 UTC vs.
Revision 1.8 by root, Sun Nov 4 16:52:52 2007 UTC

  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #ifndef _EVENT_H_
 #define _EVENT_H_
+#ifndef EV_EMBED
+# include "ev.h"
+#endif
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "ev.h"
 struct event
 {
-  /* lib watchers we map to */
+  /* libev watchers we map onto */
   union {
     struct ev_io io;
     struct ev_signal sig;
   } iosig;
   struct ev_timer to;
   void *ev_arg;
   int ev_fd;
   int ev_pri;
   int ev_res;
   short ev_events;
+  char initialised; /* flag to work around some idiosynchrasies in the API */
 };
 #define EV_PERSIST                 0x10
 #define EVENT_SIGNAL(ev)           ((int) (ev)->ev_fd)
 #define EVENT_FD(ev)               ((int) (ev)->ev_fd)
-#define event_initialized(ev)      1
+#define event_initialized(ev)      ((ev)->initialised)
 #define evtimer_add(ev,tv)         event_add (ev, tv)
 #define evtimer_set(ev,cb,data)    event_set (ev, -1, 0, cb, data)
 #define evtimer_del(ev)            event_del (ev)
 #define evtimer_pending(ev,tv)     event_pending (ev, EV_TIMEOUT, tv)
 int event_base_loopexit (struct event_base *base, struct timeval *tv);
 int event_base_dispatch (struct event_base *base);
 int event_base_once (struct event_base *base, int fd, short events, void (*cb)(int, short, void *), void *arg, struct timeval *tv);
 int event_base_priority_init (struct event_base *base, int fd);
+#ifndef EV_EMBED
+# include "event_compat.h"
 #endif
+#ifdef __cplusplus
+}
+#endif
+#endif

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