summaryrefslogtreecommitdiff
path: root/signal.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2010-10-27 17:37:32 -0400
committerNick Mathewson <nickm@torproject.org>2010-10-27 17:37:32 -0400
commitb81217f78dc511782451e793b0505624d8159499 (patch)
tree390ec459dff1f197b148e893a5265121e29ff235 /signal.c
parent1ae82cd8c6aba98d21342d242facd1bb5e461555 (diff)
downloadlibevent-b81217f78dc511782451e793b0505624d8159499.tar.gz
Fix signal handler types for win64.
Diffstat (limited to 'signal.c')
-rw-r--r--signal.c14
1 files changed, 7 insertions, 7 deletions
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