diff options
| author | Nick Mathewson <nickm@torproject.org> | 2007-08-17 22:55:41 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2007-08-17 22:55:41 +0000 |
| commit | b49704515afaa034a8eecdeac4095760ce50e555 (patch) | |
| tree | 62873577ebad55a9b68b68b90fa64dfa15d4412e | |
| parent | e95d404a6ec02953a7d461c32dd91670e3bea511 (diff) | |
| download | libevent-b49704515afaa034a8eecdeac4095760ce50e555.tar.gz | |
r14646@catbus: nickm | 2007-08-17 18:54:30 -0400
Disable references to signal code that were keeping Libevent 1.3 from building on mingw. For 1.4, we will want a more permanent solution, like re-enabling signals on mingw.
svn:r396
| -rw-r--r-- | WIN32-Code/win32.c | 6 | ||||
| -rw-r--r-- | event.c | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/WIN32-Code/win32.c b/WIN32-Code/win32.c index 44be2bce..79387f24 100644 --- a/WIN32-Code/win32.c +++ b/WIN32-Code/win32.c @@ -52,7 +52,7 @@ extern struct event_list timequeue; extern struct event_list addqueue; -extern struct event_list signalqueue; +// extern struct event_list signalqueue; struct win_fd_set { u_int fd_count; @@ -410,10 +410,12 @@ signal_recalc(void) struct event *ev; /* Reinstall our signal handler. */ +#if 0 TAILQ_FOREACH(ev, &signalqueue, ev_signal_next) { if((int)signal(EVENT_SIGNAL(ev), signal_handler) == -1) return (-1); } +#endif return (0); } @@ -423,6 +425,7 @@ signal_process(void) struct event *ev; short ncalls; +#if 0 TAILQ_FOREACH(ev, &signalqueue, ev_signal_next) { ncalls = evsigcaught[EVENT_SIGNAL(ev)]; if (ncalls) { @@ -431,6 +434,7 @@ signal_process(void) event_active(ev, EV_SIGNAL, ncalls); } } +#endif memset(evsigcaught, 0, sizeof(evsigcaught)); signal_caught = 0; @@ -390,8 +390,10 @@ event_base_loop(struct event_base *base, int flags) struct timeval *tv_p; int res, done; +#ifndef WIN32 if(!TAILQ_EMPTY(&base->sig.signalqueue)) evsignal_base = base; +#endif done = 0; while (!done) { /* Calculate the initial events that we are waiting for */ |