r19600@catbus: nickm | 2008-05-05 11:34:06 -0400

 Move EV_* flags into event.h; they are a necessary part of the public API.

svn:r774

diff --git a/include/event2/event.h b/include/event2/event.h
index 4073cca4a9bc00485caff7d2d36a27d99dff9370..963dd6f55a7e3565c9f389c9c5dc84e1f87b59f7 100644 (file)
--- a/include/event2/event.h
+++ b/include/event2/event.h
@@ -90,7 +90,6 @@ int event_reinit(struct event_base *base);
  */
 int event_base_dispatch(struct event_base *);
 
-
 /**
  Get the kernel event notification mechanism used by libevent.
  
@@ -200,6 +199,14 @@ int event_base_loopbreak(struct event_base *);
 void evperiodic_assign(struct event *ev, struct event_base *base,
     struct timeval *tv, void (*cb)(int, short, void *), void *arg);
 
+/* Flags to pass to event_set(), event_new(), event_assign(),
+ * event_pending()... */
+#define EV_TIMEOUT     0x01
+#define EV_READ                0x02
+#define EV_WRITE       0x04
+#define EV_SIGNAL      0x08
+#define EV_PERSIST     0x10    /* Persistant event */
+
 /**
   Define a timer event.
 
@@ -267,7 +274,6 @@ void evperiodic_assign(struct event *ev, struct event_base *base,
 #define signal_pending(ev, tv)         event_pending(ev, EV_SIGNAL, tv)
 #define signal_initialized(ev)         _event_initialized((ev), 0)
 
-
 /**
   Prepare an event structure to be added.
 

diff --git a/include/event2/event_struct.h b/include/event2/event_struct.h
index 2871d48659ccf8f6a833488d84f0aa3e6f29655d..70be907276037fd742e7d17d117a87c10d85304b 100644 (file)
--- a/include/event2/event_struct.h
+++ b/include/event2/event_struct.h
@@ -67,12 +67,6 @@ typedef unsigned short u_short;
 /* EVLIST_X_ Private space: 0x1000-0xf000 */
 #define EVLIST_ALL     (0xf000 | 0x9f)
 
-#define EV_TIMEOUT     0x01
-#define EV_READ                0x02
-#define EV_WRITE       0x04
-#define EV_SIGNAL      0x08
-#define EV_PERSIST     0x10    /* Persistant event */
-
 /* Fix so that ppl dont have to run with <sys/queue.h> */
 #ifndef TAILQ_ENTRY
 #define _EVENT_DEFINED_TQENTRY