include of yaz/proto.h not necessary

[pazpar2-moved-to-github.git] / src / eventl.h

diff --git a/src/eventl.h b/src/eventl.h
index 442684e..e22b90e 100644 (file)
--- a/src/eventl.h
+++ b/src/eventl.h
@@ -38,7 +38,6 @@ typedef struct iochan
 #define EVENT_OUTPUT    0x02
 #define EVENT_EXCEPT    0x04
 #define EVENT_TIMEOUT   0x08
-    int force_event;
     IOC_CALLBACK fun;
     IOC_SOCKETFUN socketfun;
     IOC_MASKFUN maskfun;
@@ -50,29 +49,24 @@ typedef struct iochan
     int thread_users;
 
     iochan_man_t man;
-
+    char *name;
     struct iochan *next;
 } *IOCHAN;
 
 
-iochan_man_t iochan_man_create(int use_threads);
+iochan_man_t iochan_man_create(int no_threads);
 void iochan_add(iochan_man_t man, IOCHAN chan);
 void iochan_man_events(iochan_man_t man);
 void iochan_man_destroy(iochan_man_t *mp);
 
 #define iochan_destroy(i) (void)((i)->destroyed = 1)
 #define iochan_getfd(i) ((i)->fd)
-#define iochan_setfd(i, f) ((i)->fd = (f))
 #define iochan_getdata(i) ((i)->data)
 #define iochan_setdata(i, d) ((i)->data = d)
-#define iochan_getflags(i) ((i)->flags)
 #define iochan_setflags(i, d) ((i)->flags = d)
 #define iochan_setflag(i, d) ((i)->flags |= d)
 #define iochan_clearflag(i, d) ((i)->flags &= ~(d))
 #define iochan_getflag(i, d) ((i)->flags & d ? 1 : 0)
-#define iochan_getfun(i) ((i)->fun)
-#define iochan_setfun(i, d) ((i)->fun = d)
-#define iochan_setevent(i, e) ((i)->force_event = (e))
 #define iochan_settimeout(i, t) ((i)->max_idle = (t), (i)->last_event = time(0))
 #define iochan_activity(i) ((i)->last_event = time(0))
 #define iochan_setsocketfun(i, f) ((i)->socketfun = (f))
@@ -80,7 +74,9 @@ void iochan_man_destroy(iochan_man_t *mp);
 #define iochan_setmaskfun(i, f) ((i)->maskfun = (f))
 #define iochan_getmaskfun(i) ((i)->maskfun)
 
-IOCHAN iochan_create(int fd, IOC_CALLBACK cb, int flags);
+IOCHAN iochan_create(int fd, IOC_CALLBACK cb, int flags, const char *name);
+
+void pazpar2_sleep(double d);
 
 #endif
 /*