[or-cvs] [tor/master] Fix some win32 compilation warnings

[Nick Mathewson]

Author: Nick Mathewson <nickm at torproject.org>
Date: Mon, 28 Sep 2009 19:52:56 -0400
Subject: Fix some win32 compilation warnings
Commit: 3e82981795388c1b6dd13b5ab829321048682c15

---
 src/or/config.c |    2 ++
 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 474b887..b565d29 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 4f96fbe..bdaee16 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);
-- 
1.5.6.5