Merge remote-tracking branch 'origin/maint-0.2.2'

This commit is contained in:
Nick Mathewson 2011-05-04 20:33:38 -04:00
commit 7de3a19497

View File

@ -1814,6 +1814,7 @@ do_main_loop(void)
} }
} }
#ifndef MS_WINDOWS /* Only called when we're willing to use signals */
/** Libevent callback: invoked when we get a signal. /** Libevent callback: invoked when we get a signal.
*/ */
static void static void
@ -1825,6 +1826,7 @@ signal_callback(int fd, short events, void *arg)
process_signal(sig); process_signal(sig);
} }
#endif
/** Do the work of acting on a signal received in <b>sig</b> */ /** Do the work of acting on a signal received in <b>sig</b> */
void void