Use ev_[u]intptr_t types in place of [u]intptr_t

diff --git a/bufferevent_async.c b/bufferevent_async.c
index 085a2db82efa5a270ab4891fbbc4d4fd954634b1..2075f48fbe8029346fbbef9b19abfd2f9467dd12 100644 (file)
--- a/bufferevent_async.c
+++ b/bufferevent_async.c
@@ -292,7 +292,7 @@ be_async_flush(struct bufferevent *bev, short what,
 }
 
 static void
-connect_complete(struct event_overlapped *eo, uintptr_t key,
+connect_complete(struct event_overlapped *eo, ev_uintptr_t key,
     ev_ssize_t nbytes, int ok)
 {
        struct bufferevent_async *bev_a = upcast_connect(eo);
@@ -311,7 +311,7 @@ connect_complete(struct event_overlapped *eo, uintptr_t key,
 }
 
 static void
-read_complete(struct event_overlapped *eo, uintptr_t key,
+read_complete(struct event_overlapped *eo, ev_uintptr_t key,
     ev_ssize_t nbytes, int ok)
 {
        struct bufferevent_async *bev_a = upcast_read(eo);
@@ -344,7 +344,7 @@ read_complete(struct event_overlapped *eo, uintptr_t key,
 }
 
 static void
-write_complete(struct event_overlapped *eo, uintptr_t key,
+write_complete(struct event_overlapped *eo, ev_uintptr_t key,
     ev_ssize_t nbytes, int ok)
 {
        struct bufferevent_async *bev_a = upcast_write(eo);

diff --git a/event_iocp.c b/event_iocp.c
index 9cce605b7bc69cd878c1aee4807c704e1dff95f5..0dd4e90474860146884014c4799768ba685017c4 100644 (file)
--- a/event_iocp.c
+++ b/event_iocp.c
@@ -93,7 +93,7 @@ loop(void *_port)
 
 int
 event_iocp_port_associate(struct event_iocp_port *port, evutil_socket_t fd,
-    uintptr_t key)
+    ev_uintptr_t key)
 {
        HANDLE h;
        h = CreateIoCompletionPort((HANDLE)fd, port->port, key, port->n_threads);
@@ -186,8 +186,8 @@ event_iocp_port_launch(void)
                goto err;
 
        for (i=0; i<port->n_threads; ++i) {
-               uintptr_t th = _beginthread(loop, 0, port);
-               if (th == (uintptr_t)-1)
+               ev_uintptr_t th = _beginthread(loop, 0, port);
+               if (th == (ev_uintptr_t)-1)
                        goto err;
                port->threads[i] = (HANDLE)th;
                ++port->n_live_threads;
@@ -254,7 +254,7 @@ event_iocp_shutdown(struct event_iocp_port *port, long waitMsec)
 int
 event_iocp_activate_overlapped(
     struct event_iocp_port *port, struct event_overlapped *o,
-    uintptr_t key, ev_uint32_t n)
+    ev_uintptr_t key, ev_uint32_t n)
 {
        BOOL r;
 

diff --git a/iocp-internal.h b/iocp-internal.h
index 0f8d3c81089f64698d642d29d3d63d1da7cb00d6..76eea65ae2767d58ab6ca569cf94b25b4b8a599e 100644 (file)
--- a/iocp-internal.h
+++ b/iocp-internal.h
@@ -34,7 +34,7 @@ extern "C" {
 struct event_overlapped;
 struct event_iocp_port;
 struct evbuffer;
-typedef void (*iocp_callback)(struct event_overlapped *, uintptr_t, ev_ssize_t, int success);
+typedef void (*iocp_callback)(struct event_overlapped *, ev_uintptr_t, ev_ssize_t, int success);
 
 /* This whole file is actually win32 only. We wrap the structures in a win32
  * ifdef so that we can test-compile code that uses these interfaces on
@@ -161,7 +161,7 @@ struct event_iocp_port *event_iocp_port_launch(void);
     fd will happen on one of the iocp's worker threads.
 */
 int event_iocp_port_associate(struct event_iocp_port *port, evutil_socket_t fd,
-    uintptr_t key);
+    ev_uintptr_t key);
 
 /** Tell all threads serving an iocp to stop.  Wait for up to waitMsec for all
     the threads to finish whatever they're doing.  If all the threads are
@@ -173,7 +173,7 @@ int event_iocp_shutdown(struct event_iocp_port *port, long waitMsec);
 /* FIXME document. */
 int event_iocp_activate_overlapped(struct event_iocp_port *port,
     struct event_overlapped *o,
-    uintptr_t key, ev_uint32_t n_bytes);
+    ev_uintptr_t key, ev_uint32_t n_bytes);
 
 struct event_base;
 /* FIXME document. */

diff --git a/listener.c b/listener.c
index fb60ef3f90823063f1172edcb999b6902f0e0a1d..0777250278ea7fef310a9bfab983146da980ccb7 100644 (file)
--- a/listener.c
+++ b/listener.c
@@ -313,7 +313,7 @@ struct accepting_socket {
        char addrbuf[1];
 };
 
-static void accepted_socket_cb(struct event_overlapped *o, uintptr_t key,
+static void accepted_socket_cb(struct event_overlapped *o, ev_uintptr_t key,
     ev_ssize_t n, int ok);
 static void accepted_socket_invoke_user_cb(struct deferred_cb *cb, void *arg);
 
@@ -441,7 +441,7 @@ accepted_socket_invoke_user_cb(struct deferred_cb *cb, void *arg)
 }
 
 static void
-accepted_socket_cb(struct event_overlapped *o, uintptr_t key, ev_ssize_t n, int ok)
+accepted_socket_cb(struct event_overlapped *o, ev_uintptr_t key, ev_ssize_t n, int ok)
 {
        struct accepting_socket *as =
            EVUTIL_UPCAST(o, struct accepting_socket, overlapped);