@@ -235,7 +235,7 @@ EXPAND_ONLY_PREDEF     = NO

 SEARCH_INCLUDES        = YES

 INCLUDE_PATH           =

 INCLUDE_FILE_PATTERNS  =

-PREDEFINED             = WIN32 NTLM USE_LZO ENABLE_FRAGMENT P2MP P2MP_SERVER ENABLE_CRYPTO ENABLE_CRYPTO_OPENSSL ENABLE_PLUGIN ENABLE_MANAGEMENT ENABLE_OCC HAVE_GETTIMEOFDAY

+PREDEFINED             = _WIN32 NTLM USE_LZO ENABLE_FRAGMENT P2MP P2MP_SERVER ENABLE_CRYPTO ENABLE_CRYPTO_OPENSSL ENABLE_PLUGIN ENABLE_MANAGEMENT ENABLE_OCC HAVE_GETTIMEOFDAY

 EXPAND_AS_DEFINED      =

 SKIP_FUNCTION_MACROS   = YES

 #---------------------------------------------------------------------------

@@ -154,7 +154,7 @@ typedef void *openvpn_plugin_handle_t;

 /*

  * For Windows (needs to be modified for MSVC)

  */

-#if defined(WIN32) && !defined(OPENVPN_PLUGIN_H)

+#if defined(_WIN32) && !defined(OPENVPN_PLUGIN_H)

 # define OPENVPN_EXPORT __declspec(dllexport)

 #else

 # define OPENVPN_EXPORT

@@ -32,7 +32,7 @@

 #include "compat.h"

-#ifdef WIN32

+#ifdef _WIN32

 /*

  * NOTICE: mingw has much faster gettimeofday!

  * autoconf will set HAVE_GETTIMEOFDAY

@@ -126,6 +126,6 @@ gettimeofday (struct timeval *tv, void *tz)

 	return 0;

 }

-#endif /* WIN32 */

+#endif /* _WIN32 */

 #endif /* HAVE_GETTIMEOFDAY */

@@ -32,7 +32,7 @@

 #include "compat.h"

-#ifdef WIN32

+#ifdef _WIN32

 #include <windows.h>

@@ -32,7 +32,7 @@

 #include "compat.h"

-#ifdef WIN32

+#ifdef _WIN32

 #include <windows.h>

 #include <string.h>

@@ -35,7 +35,7 @@

 #include "syshead.h"

-#ifdef WIN32

+#ifdef _WIN32

 #include <fwpmu.h>

 #include <initguid.h>

@@ -22,7 +22,7 @@

  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

  */

-#ifdef WIN32

+#ifdef _WIN32

 #ifndef OPENVPN_BLOCK_DNS_H

 #define OPENVPN_BLOCK_DNS_H

@@ -30,7 +30,7 @@

  */

 #ifdef USE_64_BIT_COUNTERS

   typedef unsigned long long int counter_type;

-# ifdef WIN32

+# ifdef _WIN32

 #  define counter_format  "%I64u"

 # else

 #  define counter_format  "%llu"

@@ -41,7 +41,7 @@

 #include "buffer.h"

 #include "misc.h"

-#ifdef WIN32

+#ifdef _WIN32

 #include "win32.h"

@@ -119,7 +119,7 @@ static bool get_console_input_win32 (const char *prompt, const bool echo, char *

     return false;

 }

-#endif   /* WIN32 */

+#endif   /* _WIN32 */

 #ifdef HAVE_GETPASS

@@ -176,7 +176,7 @@ static bool get_console_input (const char *prompt, const bool echo, char *input,

     ASSERT (capacity > 0);

     input[0] = '\0';

-#if defined(WIN32)

+#if defined(_WIN32)

     return get_console_input_win32 (prompt, echo, input, capacity);

 #elif defined(HAVE_GETPASS)

@@ -465,4 +465,4 @@ int SSL_CTX_use_CryptoAPI_certificate(SSL_CTX *ssl_ctx, const char *cert_prop)

 #ifdef _MSC_VER  /* Dummy function needed to avoid empty file compiler warning in Microsoft VC */

 static void dummy (void) {}

 #endif

-#endif				/* WIN32 */

+#endif				/* _WIN32 */

@@ -453,7 +453,7 @@ close_syslog ()

 #endif

 }

-#ifdef WIN32

+#ifdef _WIN32

 static HANDLE orig_stderr;

@@ -471,7 +471,7 @@ get_orig_stderr (void)

 void

 redirect_stdout_stderr (const char *file, bool append)

 {

-#if defined(WIN32)

+#if defined(_WIN32)

   if (!std_redir)

     {

       struct gc_arena gc = gc_new ();

@@ -622,7 +622,7 @@ x_check_status (int status,

 	      sock->info.mtu_changed = true;

 	    }

 	}

-#elif defined(WIN32)

+#elif defined(_WIN32)

       /* get possible driver error from TAP-Windows driver */

       extended_msg = tap_win_getinfo (tt, &gc);

 #endif

@@ -677,7 +677,7 @@ openvpn_exit (const int status)

       tun_abort();

-#ifdef WIN32

+#ifdef _WIN32

       uninit_win32 ();

 #endif

@@ -737,7 +737,7 @@ crash (void)

 }

 #endif

-#ifdef WIN32

+#ifdef _WIN32

 const char *

 strerror_win32 (DWORD errnum, struct gc_arena *gc)

@@ -71,7 +71,7 @@ struct gc_arena;

 /* String and Error functions */

-#ifdef WIN32

+#ifdef _WIN32

 # define openvpn_errno()             GetLastError()

 # define openvpn_strerror(e, gc)     strerror_win32(e, gc)

   const char *strerror_win32 (DWORD errnum, struct gc_arena *gc);

@@ -261,7 +261,7 @@ void close_syslog ();

 /* log file output */

 void redirect_stdout_stderr (const char *file, bool append);

-#ifdef WIN32

+#ifdef _WIN32

 /* get original stderr handle, even if redirected by --log/--log-append */

 HANDLE get_orig_stderr (void);

 #endif

@@ -356,7 +356,7 @@ static inline bool

 ignore_sys_error (const int err)

 {

   /* I/O operation pending */

-#ifdef WIN32

+#ifdef _WIN32

   if (err == WSAEWOULDBLOCK || err == WSAEINVAL)

     return true;

 #else

@@ -49,7 +49,7 @@

 /*

  * All non-windows OSes are assumed to have select()

  */

-#ifdef WIN32

+#ifdef _WIN32

 #define SELECT 0

 #else

 #define SELECT 1

@@ -74,7 +74,7 @@ tv_to_ms_timeout (const struct timeval *tv)

     return max_int (tv->tv_sec * 1000 + (tv->tv_usec + 500) / 1000, 1);

 }

-#ifdef WIN32

+#ifdef _WIN32

 struct we_set

 {

@@ -462,7 +462,7 @@ we_init (int *maxevents, unsigned int flags)

   return (struct event_set *) wes;

 }

-#endif /* WIN32 */

+#endif /* _WIN32 */

 #if EPOLL

@@ -1007,7 +1007,7 @@ static struct event_set *

 event_set_init_simple (int *maxevents, unsigned int flags)

 {

   struct event_set *ret = NULL;

-#ifdef WIN32

+#ifdef _WIN32

   ret = we_init (maxevents, flags);

 #elif POLL && SELECT

 #if 0 /* Define to 1 if EVENT_METHOD_US_TIMEOUT should cause select to be favored over poll */

@@ -42,7 +42,7 @@

 #define EVENT_METHOD_US_TIMEOUT   (1<<0)

 #define EVENT_METHOD_FAST         (1<<1)

-#ifdef WIN32

+#ifdef _WIN32

 typedef const struct rw_handle *event_t;

@@ -137,7 +137,7 @@ event_set_return_init (struct event_set_return *esr)

   esr->arg = NULL;

 }

-#ifdef WIN32

+#ifdef _WIN32

 static inline void

 wait_signal (struct event_set *es, void *arg)

@@ -39,7 +39,7 @@

 bool

 set_nonblock_action (int fd)

 {

-#ifdef WIN32

+#ifdef _WIN32

   u_long arg = 1;

   if (ioctlsocket (fd, FIONBIO, &arg))

     return false;

@@ -54,7 +54,7 @@ set_nonblock_action (int fd)

 bool

 set_cloexec_action (int fd)

 {

-#ifndef WIN32

+#ifndef _WIN32

   if (fcntl (fd, F_SETFD, FD_CLOEXEC) < 0)

     return false;

 #endif

@@ -37,7 +37,7 @@ void set_cloexec (int fd);

 static inline void openvpn_fd_set(int fd, fd_set *setp)

 {

-#ifndef WIN32 /* The Windows FD_SET() implementation does not overflow */

+#ifndef _WIN32 /* The Windows FD_SET() implementation does not overflow */

   ASSERT (fd >= 0 && fd < FD_SETSIZE);

 #endif

   FD_SET (fd, setp);

@@ -301,7 +301,7 @@ check_add_routes_dowork (struct context *c)

 	    {

 	      register_signal (c, SIGHUP, "ip-fail");

 	      c->persist.restart_sleep_seconds = 10;

-#ifdef WIN32

+#ifdef _WIN32

 	      show_routes (M_INFO|M_NOPREFIX);

 	      show_adapters (M_INFO|M_NOPREFIX);

 #endif

@@ -1420,7 +1420,7 @@ pre_select (struct context *c)

   c->c2.timeval.tv_sec = BIG_TIMEOUT;

   c->c2.timeval.tv_usec = 0;

-#if defined(WIN32)

+#if defined(_WIN32)

   if (check_debug_level (D_TAP_WIN_DEBUG))

     {

       c->c2.timeval.tv_sec = 1;

@@ -577,7 +577,7 @@ init_static (void)

   error_reset ();		/* initialize error.c */

   reset_check_status ();	/* initialize status check code in socket.c */

-#ifdef WIN32

+#ifdef _WIN32

   init_win32 ();

 #endif

@@ -1024,7 +1024,7 @@ format_common_name (struct context *c, struct gc_arena *gc)

 void

 pre_setup (const struct options *options)

 {

-#ifdef WIN32

+#ifdef _WIN32

   if (options->exit_event_name)

     {

       win32_signal_open (&win32_signal,

@@ -1245,7 +1245,7 @@ initialization_sequence_completed (struct context *c, const unsigned int flags)

   /* Test if errors */

   if (flags & ISC_ERRORS)

     {

-#ifdef WIN32

+#ifdef _WIN32

       show_routes (M_INFO|M_NOPREFIX);

       show_adapters (M_INFO|M_NOPREFIX);

       msg (M_INFO, "%s With Errors ( see http://openvpn.net/faq.html#dhcpclientserv )", message);

@@ -1260,7 +1260,7 @@ initialization_sequence_completed (struct context *c, const unsigned int flags)

   if ((flags & (ISC_ERRORS|ISC_SERVER)) == 0)

     c->options.no_advance=true;

-#ifdef WIN32

+#ifdef _WIN32

   fork_register_dns_action (c->c1.tuntap);

 #endif

@@ -1355,7 +1355,7 @@ do_route (const struct options *options,

       argv_reset (&argv);

     }

-#ifdef WIN32

+#ifdef _WIN32

   if (options->show_net_up)

     {

       show_routes (M_INFO|M_NOPREFIX);

@@ -1421,7 +1421,7 @@ do_open_tun (struct context *c)

       /* initialize (but do not open) tun/tap object */

       do_init_tun (c);

-#ifdef WIN32

+#ifdef _WIN32

       /* store (hide) interactive service handle in tuntap_options */

       c->c1.tuntap->options.msg_channel = c->options.msg_channel;

       msg (D_ROUTE, "interactive service msg_channel=%u", (unsigned int) c->options.msg_channel);

@@ -1482,7 +1482,7 @@ do_open_tun (struct context *c)

 		   c->plugins,

 		   OPENVPN_PLUGIN_UP,

 		   c->c1.tuntap->actual_name,

-#ifdef WIN32

+#ifdef _WIN32

 		   c->c1.tuntap->adapter_index,

 #endif

 		   dev_type_string (c->options.dev, c->options.dev_type),

@@ -1495,7 +1495,7 @@ do_open_tun (struct context *c)

 		   "up",

 		   c->c2.es);

-#if defined(WIN32)

+#if defined(_WIN32)

       if (c->options.block_outside_dns)

       {

         dmsg (D_LOW, "Blocking outside DNS");

@@ -1535,7 +1535,7 @@ do_open_tun (struct context *c)

 		     c->plugins,

 		     OPENVPN_PLUGIN_UP,

 		     c->c1.tuntap->actual_name,

-#ifdef WIN32

+#ifdef _WIN32

 		     c->c1.tuntap->adapter_index,

 #endif

 		     dev_type_string (c->options.dev, c->options.dev_type),

@@ -1547,7 +1547,7 @@ do_open_tun (struct context *c)

 		     NULL,

 		     "up",

 		     c->c2.es);

-#if defined(WIN32)

+#if defined(_WIN32)

       if (c->options.block_outside_dns)

         {

           dmsg (D_LOW, "Blocking outside DNS");

@@ -1585,7 +1585,7 @@ do_close_tun (struct context *c, bool force)

   if (c->c1.tuntap && c->c1.tuntap_owned)

     {

       const char *tuntap_actual = string_alloc (c->c1.tuntap->actual_name, &gc);

-#ifdef WIN32

+#ifdef _WIN32

       DWORD adapter_index = c->c1.tuntap->adapter_index;

 #endif

       const in_addr_t local = c->c1.tuntap->local;

@@ -1611,7 +1611,7 @@ do_close_tun (struct context *c, bool force)

                            c->plugins,

                            OPENVPN_PLUGIN_ROUTE_PREDOWN,

                            tuntap_actual,

-#ifdef WIN32

+#ifdef _WIN32

                            adapter_index,

 #endif

                            NULL,

@@ -1639,7 +1639,7 @@ do_close_tun (struct context *c, bool force)

 		       c->plugins,

 		       OPENVPN_PLUGIN_DOWN,

 		       tuntap_actual,

-#ifdef WIN32

+#ifdef _WIN32

 		       adapter_index,

 #endif

 		       NULL,

@@ -1653,7 +1653,7 @@ do_close_tun (struct context *c, bool force)

 		       "down",

 		       c->c2.es);

-#if defined(WIN32)

+#if defined(_WIN32)

             if (c->options.block_outside_dns)

             {

                 if (!win_wfp_uninit(c->options.msg_channel))

@@ -1673,7 +1673,7 @@ do_close_tun (struct context *c, bool force)

 			 c->plugins,

 			 OPENVPN_PLUGIN_DOWN,

 			 tuntap_actual,

-#ifdef WIN32

+#ifdef _WIN32

 			 adapter_index,

 #endif

 			 NULL,

@@ -1687,7 +1687,7 @@ do_close_tun (struct context *c, bool force)

 			 "down",

 			 c->c2.es);

-#if defined(WIN32)

+#if defined(_WIN32)

           if (c->options.block_outside_dns)

             {

               if (!win_wfp_uninit(c->options.msg_channel))

@@ -3173,7 +3173,7 @@ do_setup_fast_io (struct context *c)

 {

   if (c->options.fast_io)

     {

-#ifdef WIN32

+#ifdef _WIN32

       msg (M_INFO, "NOTE: --fast-io is disabled since we are running on Windows");

 #else

       if (!proto_is_udp(c->options.ce.proto))

@@ -3286,7 +3286,7 @@ management_callback_status_p2p (void *arg, const int version, struct status_outp

 void

 management_show_net_callback (void *arg, const int msglevel)

 {

-#ifdef WIN32

+#ifdef _WIN32

   show_routes (msglevel);

   show_adapters (msglevel);

   msg (msglevel, "END");

@@ -270,7 +270,7 @@ man_delete_unix_socket (struct management *man)

 static void

 man_close_socket (struct management *man, const socket_descriptor_t sd)

 {

-#ifndef WIN32

+#ifndef _WIN32

   /*

    * Windows doesn't need this because the ne32 event is permanently

    * enabled at struct management scope.

@@ -1413,7 +1413,7 @@ man_dispatch_command (struct management *man, struct status_output *so, const ch

   gc_free (&gc);

 }

-#ifdef WIN32

+#ifdef _WIN32

 static void

 man_start_ne32 (struct management *man)

@@ -1503,7 +1503,7 @@ man_new_connection_post (struct management *man, const char *description)

   man_connection_settings_reset (man);

-#ifdef WIN32

+#ifdef _WIN32

   man_start_ne32 (man);

 #endif

@@ -1590,7 +1590,7 @@ man_accept (struct management *man)

       if (socket_defined (man->connection.sd_top))

 	{

-#ifdef WIN32

+#ifdef _WIN32

 	  man_stop_ne32 (man);

 #endif

 	}

@@ -1654,7 +1654,7 @@ man_listen (struct management *man)

 	     print_sockaddr (man->settings.local->ai_addr, &gc));

     }

-#ifdef WIN32

+#ifdef _WIN32

   man_start_ne32 (man);

 #endif

@@ -1737,7 +1737,7 @@ man_reset_client_socket (struct management *man, const bool exiting)

 {

   if (socket_defined (man->connection.sd_cli))

     {

-#ifdef WIN32

+#ifdef _WIN32

       man_stop_ne32 (man);

 #endif

       man_close_socket (man, man->connection.sd_cli);

@@ -2254,7 +2254,7 @@ man_connection_init (struct management *man)

 {

   if (man->connection.state == MS_INITIAL)

     {

-#ifdef WIN32

+#ifdef _WIN32

       /*

        * This object is a sort of TCP/IP helper

        * for Windows.

@@ -2295,7 +2295,7 @@ man_connection_close (struct management *man)

   if (mc->es)

     event_free (mc->es);

-#ifdef WIN32

+#ifdef _WIN32

   net_event_win32_close (&mc->ne32);

 #endif

   if (socket_defined (mc->sd_top))

@@ -2731,7 +2731,7 @@ man_persist_state (unsigned int *persistent, const int n)

   return true;

 }

-#ifdef WIN32

+#ifdef _WIN32

 void

 management_socket_set (struct management *man,

@@ -257,7 +257,7 @@ struct man_connection {

   socket_descriptor_t sd_cli;

   struct openvpn_sockaddr remote;

-#ifdef WIN32

+#ifdef _WIN32

   struct net_event_win32 ne32;

 #endif

@@ -64,7 +64,7 @@ run_up_down (const char *command,

 	     const struct plugin_list *plugins,

 	     int plugin_type,

 	     const char *arg,

-#ifdef WIN32

+#ifdef _WIN32

 	     DWORD adapter_index,

 #endif

 	     const char *dev_type,

@@ -87,7 +87,7 @@ run_up_down (const char *command,

   setenv_str (es, "dev", arg);

   if (dev_type)

     setenv_str (es, "dev_type", dev_type);

-#ifdef WIN32

+#ifdef _WIN32

   setenv_int (es, "dev_idx", adapter_index);

 #endif

@@ -196,7 +196,7 @@ const char *

 system_error_message (int stat, struct gc_arena *gc)

 {

   struct buffer out = alloc_buf_gc (256, gc);

-#ifdef WIN32

+#ifdef _WIN32

   if (stat == -1)

     buf_printf (&out, "external program did not execute -- ");

   buf_printf (&out, "returned error code %d", stat);

@@ -252,7 +252,7 @@ openvpn_execve_allowed (const unsigned int flags)

 }

-#ifndef WIN32

+#ifndef _WIN32

 /*

  * Run execve() inside a fork().  Designed to replicate the semantics of system() but

  * in a safer way that doesn't require the invocation of a shell or the risks

@@ -950,7 +950,7 @@ hostname_randomize(const char *hostname, struct gc_arena *gc)

 const char *

 gen_path (const char *directory, const char *filename, struct gc_arena *gc)

 {

-#ifdef WIN32

+#ifdef _WIN32

   const int CC_PATH_RESERVED = CC_LESS_THAN|CC_GREATER_THAN|CC_COLON|

     CC_DOUBLE_QUOTE|CC_SLASH|CC_BACKSLASH|CC_PIPE|CC_QUESTION_MARK|CC_ASTERISK;

 #else

@@ -961,7 +961,7 @@ gen_path (const char *directory, const char *filename, struct gc_arena *gc)

   if (safe_filename

       && strcmp (safe_filename, ".")

       && strcmp (safe_filename, "..")

-#ifdef WIN32

+#ifdef _WIN32

       && win_safe_filename (safe_filename)

 #endif

       )

@@ -989,7 +989,7 @@ absolute_pathname (const char *pathname)

   if (pathname)

     {

       const int c = pathname[0];

-#ifdef WIN32

+#ifdef _WIN32

       return c == '\\' || (isalpha(c) && pathname[1] == ':' && pathname[2] == '\\');

 #else

       return c == '/';

@@ -56,7 +56,7 @@ void run_up_down (const char *command,

 		  const struct plugin_list *plugins,

 		  int plugin_type,

 		  const char *arg,

-#ifdef WIN32

+#ifdef _WIN32

 		  DWORD adapter_index,

 #endif

 		  const char *dev_type,

@@ -138,7 +138,7 @@ openvpn_main (int argc, char *argv[])

   return 1;

 #endif

-#ifdef WIN32

+#ifdef _WIN32

   SetConsoleOutputCP (CP_UTF8);

 #endif

@@ -172,7 +172,7 @@ openvpn_main (int argc, char *argv[])

 	  /* initialize environmental variable store */

 	  c.es = env_set_create (NULL);

-#ifdef WIN32

+#ifdef _WIN32

 	  set_win_sys_path_via_env (c.es);

 #endif

@@ -220,7 +220,7 @@ openvpn_main (int argc, char *argv[])

 	  /* print version number */

 	  msg (M_INFO, "%s", title_string);

-#ifdef WIN32

+#ifdef _WIN32

 	  show_windows_version(M_INFO);

 #endif

 	  show_library_versions(M_INFO);

@@ -312,7 +312,7 @@ openvpn_main (int argc, char *argv[])

   return 0;			            /* NOTREACHED */

 }

-#ifdef WIN32

+#ifdef _WIN32

 int

 wmain (int argc, wchar_t *wargv[]) {

   char **argv;

@@ -592,7 +592,7 @@ static const char usage_message[] =

   "                        Default is CN in the Subject field.\n"

 #endif

   "--verify-hash   : Specify SHA1 fingerprint for level-1 cert.\n"

-#ifdef WIN32

+#ifdef _WIN32

   "--cryptoapicert select-string : Load the certificate and private key from the\n"

   "                  Windows Certificate System Store.\n"

 #endif

@@ -670,7 +670,7 @@ static const char usage_message[] =

   "--show-digests  : Show message digest algorithms to use with --auth option.\n"

   "--show-engines  : Show hardware crypto accelerator engines (if available).\n"

   "--show-tls      : Show all TLS ciphers (TLS used only as a control channel).\n"

-#ifdef WIN32

+#ifdef _WIN32

   "\n"

   "Windows Specific:\n"

   "--win-sys path    : Pathname of Windows system directory. Default is the pathname\n"

@@ -720,7 +720,7 @@ static const char usage_message[] =

   "                       optional parameter controls the initial state of ex.\n"

   "--show-net-up   : Show " PACKAGE_NAME "'s view of routing table and net adapter list\n"

   "                  after TAP adapter is up and routes have been added.\n"

-#ifdef WIN32

+#ifdef _WIN32

   "--block-outside-dns   : Block DNS on other network adapters to prevent DNS leaks\n"

 #endif

   "Windows Standalone Options:\n"

@@ -816,7 +816,7 @@ init_options (struct options *o, const bool init_gc)

 #ifdef TARGET_LINUX

   o->tuntap_options.txqueuelen = 100;

 #endif

-#ifdef WIN32

+#ifdef _WIN32

 #if 0

   o->tuntap_options.ip_win32_type = IPW32_SET_ADAPTIVE;

 #else

@@ -879,7 +879,7 @@ init_options (struct options *o, const bool init_gc)

   o->auth_token_generate = false;

   /* Set default --tmp-dir */

-#ifdef WIN32

+#ifdef _WIN32

   /* On Windows, find temp dir via enviroment variables */

   o->tmp_dir = win_get_tempdir();

 #else

@@ -888,7 +888,7 @@ init_options (struct options *o, const bool init_gc)

   if( !o->tmp_dir ) {

           o->tmp_dir = "/tmp";

   }

-#endif /* WIN32 */

+#endif /* _WIN32 */

 #endif /* P2MP_SERVER */

   o->allow_recursive_routing = false;

 }

@@ -1141,7 +1141,7 @@ parse_hash_fingerprint(const char *str, int nbytes, int msglevel, struct gc_aren

 }

 #endif

-#ifdef WIN32

+#ifdef _WIN32

 #ifndef ENABLE_SMALL

@@ -1186,7 +1186,7 @@ show_tuntap_options (const struct tuntap_options *o)

 #endif

 #endif

-#if defined(WIN32) || defined(TARGET_ANDROID)

+#if defined(_WIN32) || defined(TARGET_ANDROID)

 static void

 dhcp_option_address_parse (const char *name, const char *parm, in_addr_t *array, int *len, int msglevel)

 {

@@ -1741,7 +1741,7 @@ show_settings (const struct options *o)

   show_p2mp_parms (o);

 #endif

-#ifdef WIN32

+#ifdef _WIN32

   SHOW_BOOL (show_net_up);

   SHOW_INT (route_method);

   SHOW_BOOL (block_outside_dns);

@@ -2033,7 +2033,7 @@ options_postprocess_verify_ce (const struct options *options, const struct conne

    * Windows-specific options.

    */

-#ifdef WIN32

+#ifdef _WIN32

       if (dev == DEV_TYPE_TUN && !(pull || (options->ifconfig_local && options->ifconfig_remote_netmask)))

 	msg (M_USAGE, "On Windows, --ifconfig is required when --dev tun is used");

@@ -2512,7 +2512,7 @@ options_postprocess_mutate_ce (struct options *o, struct connection_entry *ce)

 static void

 options_postprocess_mutate_invariant (struct options *options)

 {

-#ifdef WIN32

+#ifdef _WIN32

   const int dev = dev_type_enum (options->dev, options->dev_type);

 #endif

@@ -2523,7 +2523,7 @@ options_postprocess_mutate_invariant (struct options *options)

   if (options->inetd == INETD_NOWAIT)

     options->ifconfig_noexec = true;

-#ifdef WIN32

+#ifdef _WIN32

   if ((dev == DEV_TYPE_TUN || dev == DEV_TYPE_TAP) && !options->route_delay_defined)

     {

       if (options->mode == MODE_POINT_TO_POINT)

@@ -2546,7 +2546,7 @@ options_postprocess_mutate_invariant (struct options *options)

    */

   if (options->mode == MODE_SERVER)

     {

-#ifdef WIN32

+#ifdef _WIN32

       /*

        * We need to explicitly set --tap-sleep because

        * we do not schedule event timers in the top-level context.

@@ -2689,7 +2689,7 @@ options_postprocess_mutate (struct options *o)

 static void

 warn_if_group_others_accessible (const char* filename)

 {

-#ifndef WIN32

+#ifndef _WIN32

 #ifdef HAVE_STAT

   if (strcmp (filename, INLINE_FILE_TAG))

     {

@@ -3608,7 +3608,7 @@ usage_small (void)

   openvpn_exit (OPENVPN_EXIT_STATUS_USAGE); /* exit point */

 }

-#ifdef WIN32

+#ifdef _WIN32

 void show_windows_version(const unsigned int flags)

 {

   struct gc_arena gc = gc_new ();

@@ -3642,7 +3642,7 @@ usage_version (void)

 {

   msg (M_INFO|M_NOPREFIX, "%s", title_string);

   show_library_versions( M_INFO|M_NOPREFIX );

-#ifdef WIN32

+#ifdef _WIN32

   show_windows_version( M_INFO|M_NOPREFIX );

 #endif

   msg (M_INFO|M_NOPREFIX, "Originally developed by James Yonan");

@@ -3689,7 +3689,7 @@ positive_atoi (const char *str)

   return i < 0 ? 0 : i;

 }

-#ifdef WIN32  /* This function is only used when compiling on Windows */

+#ifdef _WIN32  /* This function is only used when compiling on Windows */

 static unsigned int

 atou (const char *str)

 {

@@ -6274,7 +6274,7 @@ add_option (struct options *options,

 #endif

   else if (streq (p[0], "msg-channel") && p[1])

     {

-#ifdef WIN32

+#ifdef _WIN32

       VERIFY_PERMISSION (OPT_P_GENERAL);

       HANDLE process = GetCurrentProcess ();

       HANDLE handle = (HANDLE) atoi (p[1]);

@@ -6290,7 +6290,7 @@ add_option (struct options *options,

       goto err;

 #endif

     }

-#ifdef WIN32

+#ifdef _WIN32

   else if (streq (p[0], "win-sys") && p[1] && !p[2])

     {

       VERIFY_PERMISSION (OPT_P_GENERAL);

@@ -6371,7 +6371,7 @@ add_option (struct options *options,

       to->ip_win32_defined = true; 

     }

 #endif

-#if defined(WIN32) || defined(TARGET_ANDROID)

+#if defined(_WIN32) || defined(TARGET_ANDROID)

   else if (streq (p[0], "dhcp-option") && p[1] && !p[3])

     {

       struct tuntap_options *o = &options->tuntap_options;

@@ -6424,7 +6424,7 @@ add_option (struct options *options,

       o->dhcp_options = true;

     }

 #endif

-#ifdef WIN32

+#ifdef _WIN32

   else if (streq (p[0], "show-adapters") && !p[1])

     {

       VERIFY_PERMISSION (OPT_P_GENERAL);

@@ -578,7 +578,7 @@ struct options

   /* special state parms */

   int foreign_option_index;

-#ifdef WIN32

+#ifdef _WIN32

   HANDLE msg_channel;

   const char *exit_event_name;

   bool exit_event_initial_state;

@@ -655,7 +655,7 @@ struct options

 #define PUSH_DEFINED(opt) (false)

 #endif

-#ifdef WIN32

+#ifdef _WIN32

 #define ROUTE_OPTION_FLAGS(o) ((o)->route_method & ROUTE_METHOD_MASK)

 #else

 #define ROUTE_OPTION_FLAGS(o) (0)

@@ -693,7 +693,7 @@ void usage_small (void);

 void show_library_versions(const unsigned int flags);

-#ifdef WIN32

+#ifdef _WIN32

 void show_windows_version(const unsigned int flags);

 #endif

@@ -76,8 +76,8 @@ openvpn_gettimeofday (struct timeval *tv, void *tz)

 static inline void

 update_time (void)

 {

-#ifdef WIN32