summaryrefslogtreecommitdiff
path: root/event.c
diff options
context:
space:
mode:
authorroot <root>2007-11-06 13:17:55 +0000
committerroot <root>2007-11-06 13:17:55 +0000
commit4ee0973144c5b6c7cf136b1256e7ce9cb802e682 (patch)
treedb38b2f89e37183bb2329c0c8333fb0dbdbaf4e4 /event.c
parent06eac6f8c010d4bd41a19feca9db3ac13d3cafb3 (diff)
now port to microsofts goddamn broken pseudo-c-we-do-it-different-to-spite-you so-called c compiler
Diffstat (limited to 'event.c')
-rw-r--r--event.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/event.c b/event.c
index cf7739c..0fc6850 100644
--- a/event.c
+++ b/event.c
@@ -31,9 +31,12 @@
#include <stddef.h>
#include <stdlib.h>
-#include <sys/time.h>
#include <assert.h>
+#ifndef WIN32
+# include <sys/time.h>
+#endif
+
#include "ev.h"
#include "event.h"
@@ -240,9 +243,9 @@ int event_del (struct event *ev)
int event_pending (struct event *ev, short events, struct timeval *tv)
{
+ short revents = 0;
dLOOPev;
- short revents = 0;
if (ev->ev_events & EV_SIGNAL)
{
@@ -311,8 +314,8 @@ x_loopexit_cb (int revents, void *base)
int event_base_loopexit (struct event_base *base, struct timeval *tv)
{
- dLOOPbase;
ev_tstamp after = tv_get (tv);
+ dLOOPbase;
ev_once (EV_A_ -1, 0, after >= 0. ? after : 0., x_loopexit_cb, (void *)base);
@@ -337,8 +340,8 @@ x_once_cb (int revents, void *arg)
int event_base_once (struct event_base *base, int fd, short events, void (*cb)(int, short, void *), void *arg, struct timeval *tv)
{
- dLOOPbase;
struct x_once *once = malloc (sizeof (struct x_once));
+ dLOOPbase;
if (!once)
return -1;