aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2011-05-04 20:33:16 -0400
committerNick Mathewson <nickm@torproject.org>2011-05-04 20:33:16 -0400
commitab1460f3ae00f6caab9feead455eebfb0d03d5e4 (patch)
treef2257e706d47b84ec20007067b866badf7699681
parent0ee524b57f35460229725c7a43f28ab73bfaa3fa (diff)
parent9a490bb53b98efa4cec721a80fe5fec94c554c1f (diff)
downloadtor-ab1460f3ae00f6caab9feead455eebfb0d03d5e4.tar
tor-ab1460f3ae00f6caab9feead455eebfb0d03d5e4.tar.gz
Merge remote-tracking branch 'sebastian/win_warning' into maint-0.2.2
-rw-r--r--src/or/main.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/or/main.c b/src/or/main.c
index 462b51e78..7bae59ce0 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -1587,6 +1587,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.
*/
static void
@@ -1598,6 +1599,7 @@ signal_callback(int fd, short events, void *arg)
process_signal(sig);
}
+#endif
/** Do the work of acting on a signal received in <b>sig</b> */
void