From b81217f78dc511782451e793b0505624d8159499 Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Wed, 27 Oct 2010 17:37:32 -0400 Subject: [PATCH] Fix signal handler types for win64. --- event.c | 6 +++--- signal.c | 14 +++++++------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/event.c b/event.c index 7e71ec2b..37217729 100644 --- a/event.c +++ b/event.c @@ -824,7 +824,7 @@ event_reinit(struct event_base *base) if (evmap_io_add(base, ev->ev_fd, ev) == -1) res = -1; } else if (ev->ev_events & EV_SIGNAL) { - if (evmap_signal_add(base, ev->ev_fd, ev) == -1) + if (evmap_signal_add(base, (int)ev->ev_fd, ev) == -1) res = -1; } } @@ -1995,7 +1995,7 @@ event_add_internal(struct event *ev, const struct timeval *tv, if (ev->ev_events & (EV_READ|EV_WRITE)) res = evmap_io_add(base, ev->ev_fd, ev); else if (ev->ev_events & EV_SIGNAL) - res = evmap_signal_add(base, ev->ev_fd, ev); + res = evmap_signal_add(base, (int)ev->ev_fd, ev); if (res != -1) event_queue_insert(base, ev, EVLIST_INSERTED); if (res == 1) { @@ -2173,7 +2173,7 @@ event_del_internal(struct event *ev) if (ev->ev_events & (EV_READ|EV_WRITE)) res = evmap_io_del(base, ev->ev_fd, ev); else - res = evmap_signal_del(base, ev->ev_fd, ev); + res = evmap_signal_del(base, (int)ev->ev_fd, ev); if (res == 1) { /* evmap says we need to notify the main thread. */ notify = 1; diff --git a/signal.c b/signal.c index 4a5763ab..ec27ea88 100644 --- a/signal.c +++ b/signal.c @@ -87,8 +87,8 @@ #define __cdecl #endif -static int evsig_add(struct event_base *, int, short, short, void *); -static int evsig_del(struct event_base *, int, short, short, void *); +static int evsig_add(struct event_base *, evutil_socket_t, short, short, void *); +static int evsig_del(struct event_base *, evutil_socket_t, short, short, void *); static const struct eventop evsigops = { "signal", @@ -278,7 +278,7 @@ _evsig_set_handler(struct event_base *base, } static int -evsig_add(struct event_base *base, int evsignal, short old, short events, void *p) +evsig_add(struct event_base *base, evutil_socket_t evsignal, short old, short events, void *p) { struct evsig_info *sig = &base->sig; (void)p; @@ -301,8 +301,8 @@ evsig_add(struct event_base *base, int evsignal, short old, short events, void * evsig_base_fd = base->sig.ev_signal_pair[0]; EVSIGBASE_UNLOCK(); - event_debug(("%s: %d: changing signal handler", __func__, evsignal)); - if (_evsig_set_handler(base, evsignal, evsig_handler) == -1) { + event_debug(("%s: %d: changing signal handler", __func__, (int)evsignal)); + if (_evsig_set_handler(base, (int)evsignal, evsig_handler) == -1) { goto err; } @@ -355,7 +355,7 @@ _evsig_restore_handler(struct event_base *base, int evsignal) } static int -evsig_del(struct event_base *base, int evsignal, short old, short events, void *p) +evsig_del(struct event_base *base, evutil_socket_t evsignal, short old, short events, void *p) { EVUTIL_ASSERT(evsignal >= 0 && evsignal < NSIG); @@ -366,7 +366,7 @@ evsig_del(struct event_base *base, int evsignal, short old, short events, void * --base->sig.ev_n_signals_added; EVSIGBASE_UNLOCK(); - return (_evsig_restore_handler(base, evsignal)); + return (_evsig_restore_handler(base, (int)evsignal)); } static void __cdecl -- 2.40.0