Commit 3e829817 authored by Nick Mathewson's avatar Nick Mathewson 🤹
Browse files

Fix some win32 compilation warnings

parent 008dc890

src/or/config.c

+2 −0
Original line number Diff line number Diff line
@@ -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;

src/or/ntmain.c

+8 −1
Original line number Diff line number Diff line
@@ -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);