Fix a few mingw64 incompatibilities introduced since 2.0

diff --git a/buffer.c b/buffer.c
index a78ba26c8d4b0fff8958e7040f0050a529b23fe3..0a8a7df3b07df460748d37e46dfc967317a3ae32 100644 (file)
--- a/buffer.c
+++ b/buffer.c
@@ -2990,10 +2990,10 @@ evbuffer_file_segment_materialize(struct evbuffer_file_segment *seg)
 #endif
 #ifdef _WIN32
        if (!(flags & EVBUF_FS_DISABLE_MMAP)) {
-               long h = (long)_get_osfhandle(fd);
+               intptr_t h = _get_osfhandle(fd);
                HANDLE m;
                ev_uint64_t total_size = length+offset;
-               if (h == (long)INVALID_HANDLE_VALUE)
+               if ((HANDLE)h == INVALID_HANDLE_VALUE)
                        goto err;
                m = CreateFileMapping((HANDLE)h, NULL, PAGE_READONLY,
                    (total_size >> 32), total_size & 0xfffffffful,

diff --git a/event.c b/event.c
index 62744f80a178721d70847990867684e4fe91e82f..6e6e64dd7782bd64cf2ed227337437e096b6e7e1 100644 (file)
--- a/event.c
+++ b/event.c
@@ -2747,8 +2747,8 @@ event_queue_remove_inserted(struct event_base *base, struct event *ev)
 {
        EVENT_BASE_ASSERT_LOCKED(base);
        if (EVUTIL_FAILURE_CHECK(!(ev->ev_flags & EVLIST_INSERTED))) {
-               event_errx(1, "%s: %p(fd %d) not on queue %x", __func__,
-                          ev, ev->ev_fd, EVLIST_INSERTED);
+               event_errx(1, "%s: %p(fd "EV_SOCK_FMT") not on queue %x", __func__,
+                   ev, EV_SOCK_ARG(ev->ev_fd), EVLIST_INSERTED);
                return;
        }
        DECR_EVENT_COUNT(base, ev->ev_flags);

diff --git a/signal.c b/signal.c
index d73e4d993ca080606d687cfef4c2b86cc4aa0705..63b3856692f99e464271e597eec33035c9f4e9c4 100644 (file)
--- a/signal.c
+++ b/signal.c
@@ -362,7 +362,7 @@ evsig_del(struct event_base *base, evutil_socket_t evsignal, short old, short ev
 {
        EVUTIL_ASSERT(evsignal >= 0 && evsignal < NSIG);
 
-       event_debug(("%s: %d: restoring signal handler", __func__, evsignal));
+       event_debug(("%s: "EV_SOCK_FMT": restoring signal handler", __func__, EV_SOCK_ARG(evsignal)));
 
        EVSIGBASE_LOCK();
        --evsig_base_n_signals_added;

diff --git a/test/test-dumpevents.c b/test/test-dumpevents.c
index ff01b3f841d84f1533bb8f745248191d7779c89d..1c272d4c01602ff67378ef8a910f16a5f05dc409 100644 (file)
--- a/test/test-dumpevents.c
+++ b/test/test-dumpevents.c
@@ -81,11 +81,10 @@ main(int argc, char **argv)
 #ifdef _WIN32
        WORD wVersionRequested;
        WSADATA wsaData;
-       int     err;
 
        wVersionRequested = MAKEWORD(2, 2);
 
-       err = WSAStartup(wVersionRequested, &wsaData);
+       WSAStartup(wVersionRequested, &wsaData);
 #endif
 
 #ifdef _WIN32