diff options
| author | Nick Mathewson <nickm@torproject.org> | 2009-01-13 21:39:32 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2009-01-13 21:39:32 +0000 |
| commit | 9935d5b01e4345829a7ea5c06e86d45156ea8944 (patch) | |
| tree | 3cc8032d7d4ca9db8256a8741dbb217a875ac6fb /WIN32-Code | |
| parent | 574d320217b07023ac2e50a16f7999f04aceffae (diff) | |
| download | libevent-9935d5b01e4345829a7ea5c06e86d45156ea8944.tar.gz | |
Fix win32 compilation. Surprisingly, unit tests pass too.
svn:r1002
Diffstat (limited to 'WIN32-Code')
| -rw-r--r-- | WIN32-Code/win32.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/WIN32-Code/win32.c b/WIN32-Code/win32.c index 863f4e30..d7b94ac7 100644 --- a/WIN32-Code/win32.c +++ b/WIN32-Code/win32.c @@ -48,7 +48,7 @@ #include "log-internal.h" #include "event.h" #include "event-internal.h" -#include "evmap-inernal.h" +#include "evmap-internal.h" #define XFREE(ptr) do { if (ptr) mm_free(ptr); } while(0) @@ -95,7 +95,7 @@ RB_PROTOTYPE(event_map, event_entry, node, compare); RB_GENERATE(event_map, event_entry, node, compare); void *win32_init (struct event_base *); -int win32_insert(struct event_base *, evutil_socket_t, short old short events); +int win32_insert(struct event_base *, evutil_socket_t, short old, short events); int win32_del(struct event_base *, evutil_socket_t, short old, short events); int win32_dispatch (struct event_base *base, struct timeval *); void win32_dealloc (struct event_base *); @@ -292,7 +292,7 @@ win32_del(struct event_base *base, evutil_socket_t fd, short old, short events) do_fd_clear(win32op, ent, 1); if (events & EV_WRITE) do_fd_clear(win32op, ent, 0); - if ((events & (EV_WRITE|EV_READ) == (EV_WRITE|EV_READ)) { + if ((events & (EV_WRITE|EV_READ)) == (EV_WRITE|EV_READ)) { RB_REMOVE(event_map, &win32op->event_root, ent); mm_free(ent); } @@ -356,19 +356,16 @@ win32_dispatch(struct event_base *base, struct timeval *tv) } for (i=0; i<win32op->readset_out->fd_count; ++i) { - struct event_entry *ent; SOCKET s = win32op->readset_out->fd_array[i]; evmap_io_active(base, s, EV_READ); } for (i=0; i<win32op->exset_out->fd_count; ++i) { - struct event_entry *ent; SOCKET s = win32op->exset_out->fd_array[i]; - evmap_io_active(base, s, EV_READ, 1); + evmap_io_active(base, s, EV_READ); } for (i=0; i<win32op->writeset_out->fd_count; ++i) { - struct event_entry *ent; SOCKET s = win32op->writeset_out->fd_array[i]; - evmap_io_active(base, s, EV_WRITE, 1); + evmap_io_active(base, s, EV_WRITE); } return (0); |