diff options
| author | Nick Mathewson <nickm@torproject.org> | 2009-09-28 19:52:56 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2009-09-28 19:56:36 -0400 |
| commit | 3e82981795388c1b6dd13b5ab829321048682c15 (patch) | |
| tree | 9b068697f3b15f44a19c969e9aac088a91840116 | |
| parent | 008dc890d8d393f3a7be8ffae131632e46c5bc53 (diff) | |
| download | tor-3e82981795388c1b6dd13b5ab829321048682c15.tar.gz tor-3e82981795388c1b6dd13b5ab829321048682c15.zip | |
Fix some win32 compilation warnings
| -rw-r--r-- | src/or/config.c | 2 | ||||
| -rw-r--r-- | src/or/ntmain.c | 9 |
2 files changed, 10 insertions, 1 deletions
diff --git a/src/or/config.c b/src/or/config.c index 474b887bac..b565d2900d 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -2696,6 +2696,8 @@ is_listening_on_low_port(uint16_t port_option, const config_line_t *listen_options) { #ifdef MS_WINDOWS + (void) port_option; + (void) listen_options; return 0; /* No port is too low for windows. */ #else const config_line_t *l; diff --git a/src/or/ntmain.c b/src/or/ntmain.c index 4f96fbe5d7..bdaee16157 100644 --- a/src/or/ntmain.c +++ b/src/or/ntmain.c @@ -6,6 +6,13 @@ #define MAIN_PRIVATE #include "or.h" + +#ifdef HAVE_EVENT2_EVENT_H +#include <event2/event.h> +#else +#include <event.h> +#endif + #include <tchar.h> #define GENSRV_SERVICENAME TEXT("tor") #define GENSRV_DISPLAYNAME TEXT("Tor Win32 Service") @@ -218,7 +225,7 @@ nt_service_control(DWORD request) log_notice(LD_GENERAL, "Got stop/shutdown request; shutting down cleanly."); service_status.dwCurrentState = SERVICE_STOP_PENDING; - event_loopexit(&exit_now); + event_base_loopexit(tor_libevent_get_base(), &exit_now); return; } service_fns.SetServiceStatus_fn(hStatus, &service_status); |