libevent: use evutil_socket_t
diff --git a/lib/event-libs/libevent/libevent.c b/lib/event-libs/libevent/libevent.c
index 0311b9c..e9240a0 100644
--- a/lib/event-libs/libevent/libevent.c
+++ b/lib/event-libs/libevent/libevent.c
@@ -226,6 +226,12 @@
ptpr->idle_timer = event_new(loop, -1, 0,
lws_event_idle_timer_cb, pt);
+ {
+ struct timeval tv;
+ tv.tv_sec = (long)0;
+ tv.tv_usec = (long)1000;
+ evtimer_add(ptpr->hrtimer, &tv);
+ }
/* Register the signal watcher unless it's a foreign loop */
diff --git a/minimal-examples/http-server/minimal-http-server-eventlib-foreign/libevent.c b/minimal-examples/http-server/minimal-http-server-eventlib-foreign/libevent.c
index 31d7587..b68b043 100644
--- a/minimal-examples/http-server/minimal-http-server-eventlib-foreign/libevent.c
+++ b/minimal-examples/http-server/minimal-http-server-eventlib-foreign/libevent.c
@@ -23,13 +23,13 @@
static struct event *sighandler_event;
static void
-timer_cb_event(int fd, short event, void *arg)
+timer_cb_event(evutil_socket_t fd, short event, void *arg)
{
foreign_timer_service(loop_event);
}
static void
-signal_cb_event(int fd, short event, void *arg)
+signal_cb_event(evutil_socket_t fd, short event, void *arg)
{
signal_cb((int)(lws_intptr_t)arg);
}
@@ -46,11 +46,11 @@
loop_event = event_base_new();
- sighandler_event = evsignal_new(loop_event, SIGINT, signal_cb_event,
- (void*)SIGINT);
+ sighandler_event = evsignal_new((struct event_base *)loop_event, SIGINT, signal_cb_event,
+ (void*)SIGINT);
- timer_outer_event = event_new(loop_event, -1, EV_PERSIST,
- timer_cb_event, NULL);
+ timer_outer_event = event_new((struct event_base *)loop_event, -1, EV_PERSIST,
+ timer_cb_event, NULL);
//evtimer_new(loop_event, timer_cb_event, NULL);
evtimer_add(timer_outer_event, &tv);
