first rough cut at c++ interface

[software/libev.git] / event.h

diff --git a/event.h b/event.h
index 3c2f448cb0d2a1372cf453ae650422d202b5deb1..4e988c6417386186ca5d5bd4dff38444678c8bd7 100644 (file)
--- a/event.h
+++ b/event.h
@@ -28,14 +28,20 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */

-#ifndef _EVENT_H_
-#define _EVENT_H_
+#ifndef EVENT_H__
+#define EVENT_H__
+
+#ifdef EV_H
+# include EV_H
+#else
+# include <ev.h>
+#endif

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

-#include "ev.h"
+struct event_base;

 
 struct event
 {
 
 struct event
 {


@@ -104,14 +110,13 @@ 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_priority_init (int npri);
 int event_priority_set (struct event *ev, int pri);
 
 
 int event_pending (struct event *ev, short, struct timeval *tv);
 
 int event_priority_init (int npri);
 int event_priority_set (struct event *ev, int pri);
 

-struct event_base;
-

 int event_base_set (struct event_base *base, struct event *ev);
 int event_base_loop (struct event_base *base, int);
 int event_base_loopexit (struct event_base *base, struct timeval *tv);
 int event_base_set (struct event_base *base, struct event *ev);
 int event_base_loop (struct event_base *base, int);
 int event_base_loopexit (struct event_base *base, struct timeval *tv);


@@ -119,5 +124,13 @@ 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);
 
 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_STANDALONE
+# include <event_compat.h>
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+

 #endif
 
 #endif