Fix some small win32 build issues on trunk.

svn:r1306

diff --git a/buffer_iocp.c b/buffer_iocp.c
index 3c7e6e9bdbc25e9855fb78d4bfaaaa3c7a623578..2b22d50a5138345d9bb973a1ff3708f22da2d724 100644 (file)
--- a/buffer_iocp.c
+++ b/buffer_iocp.c
@@ -117,7 +117,6 @@ read_completed(struct event_overlapped *eo, uintptr_t _, ssize_t nBytes)
        struct evbuffer_overlapped *buf = buf_o->buf;
        struct evbuffer *evbuf = &buf->buffer;
 
-       struct evbuffer_chain *chain = buf_o->first_pinned;
        struct evbuffer_iovec iov[2];
        int n_vec;
 
@@ -255,7 +254,7 @@ evbuffer_launch_read(struct evbuffer *buf, size_t at_most)
        struct evbuffer_chain *chain=NULL;
        DWORD bytesRead;
        DWORD flags = 0;
-       struct evbuffer_iovec vecs[MAX_VECS];
+       struct evbuffer_iovec vecs[MAX_WSABUFS];
 
        if (!buf_o)
                return -1;

diff --git a/event_iocp.c b/event_iocp.c
index f5eb185e7cfc5b5b8671e51be1075599fb5af6a8..9aca3b89077ea2f09bd23cd39d584b24754e38bc 100644 (file)
--- a/event_iocp.c
+++ b/event_iocp.c
@@ -202,7 +202,7 @@ event_base_get_iocp(struct event_base *base)
 #ifdef WIN32
        return base->iocp;
 #else
-       return NULL
+       return NULL;
 #endif
 }
 

diff --git a/signal.c b/signal.c
index 2bbfeb4455543f50f8ae4ca4ed181382baad3c8e..f3531b860a1f1ba71874a11091d95b017068afc6 100644 (file)
--- a/signal.c
+++ b/signal.c
@@ -121,7 +121,7 @@ evsig_init(struct event_base *base)
 #ifdef WIN32
                /* Make this nonfatal on win32, where sometimes people
                   have localhost firewalled. */
-               event_sock_warn(1, -1, "%s: socketpair", __func__);
+               event_sock_warn(-1, "%s: socketpair", __func__);
 #else
                event_sock_err(1, -1, "%s: socketpair", __func__);
 #endif