summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2011-05-04 20:33:38 -0400
committerNick Mathewson <nickm@torproject.org>2011-05-04 20:33:38 -0400
commit7de3a19497f081e680e7fd35315f107510f313ad (patch)
tree768b6c99dcdab55fa7e0808575720bf65552f65c /src
parent4c9bd06d0d3d0ce8150c065a51fd432c6e689b0c (diff)
parentab1460f3ae00f6caab9feead455eebfb0d03d5e4 (diff)
downloadtor-7de3a19497f081e680e7fd35315f107510f313ad.tar.gz
tor-7de3a19497f081e680e7fd35315f107510f313ad.zip
Merge remote-tracking branch 'origin/maint-0.2.2'
Diffstat (limited to 'src')
-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 a50a3cd16d..496164ade7 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -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.
*/
static void
@@ -1825,6 +1826,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