*** empty log message ***

[software/libev.git] / event.h

diff --git a/event.h b/event.h
index d21ed3fee5898144fb2db12bdb7f6cc7e5d98c62..1466f904f223140d2c09c309215d4f059fbdee0e 100644 (file)
--- a/event.h
+++ b/event.h
@@ -31,7 +31,7 @@
 #ifndef _EVENT_H_
 #define _EVENT_H_
 
 #ifndef _EVENT_H_
 #define _EVENT_H_
 

-#include "ev.h"
+#include <ev.h>

 
 #ifdef __cplusplus
 extern "C" {
 
 #ifdef __cplusplus
 extern "C" {


@@ -54,8 +54,6 @@ struct event
   int ev_pri;
   int ev_res;
   short ev_events;
   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 EV_PERSIST                 0x10


@@ -63,7 +61,7 @@ struct event
 #define EVENT_SIGNAL(ev)           ((int) (ev)->ev_fd)
 #define EVENT_FD(ev)               ((int) (ev)->ev_fd)
 
 #define EVENT_SIGNAL(ev)           ((int) (ev)->ev_fd)
 #define EVENT_FD(ev)               ((int) (ev)->ev_fd)
 

-#define event_initialized(ev)      ((ev)->initialised)
+#define event_initialized(ev)      1

 
 #define evtimer_add(ev,tv)         event_add (ev, tv)
 #define evtimer_set(ev,cb,data)    event_set (ev, -1, 0, cb, data)
 
 #define evtimer_add(ev,tv)         event_add (ev, tv)
 #define evtimer_set(ev,cb,data)    event_set (ev, -1, 0, cb, data)


@@ -106,6 +104,7 @@ int event_once (int fd, short events, void (*cb)(int, short, void *), void *arg,
 
 int event_add (struct event *ev, struct timeval *tv);
 int event_del (struct event *ev);
 
 int event_add (struct event *ev, struct timeval *tv);
 int event_del (struct event *ev);

+void event_active (struct event *ev, int res, short ncalls); /* ncalls is being ignored */

 
 int event_pending (struct event *ev, short, struct timeval *tv);
 
 
 int event_pending (struct event *ev, short, struct timeval *tv);
 


@@ -122,7 +121,7 @@ int event_base_once (struct event_base *base, int fd, short events, void (*cb)(i
 int event_base_priority_init (struct event_base *base, int fd);
 
 #ifndef EV_STANDALONE
 int event_base_priority_init (struct event_base *base, int fd);
 
 #ifndef EV_STANDALONE

-# include "event_compat.h"
+# include <event_compat.h>

 #endif
 
 #ifdef __cplusplus
 #endif
 
 #ifdef __cplusplus