diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-01-31 10:59:42 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-01-31 15:48:47 -0500 |
| commit | 5cf9167f919dfef964b1d149731ed04941e25ebf (patch) | |
| tree | 37668dde9fd4c68d80cb1bde90523b55fba4b226 /src/tools | |
| parent | 23054543278a8ee5db6d8dae3b3a96e2b2fd5377 (diff) | |
| download | tor-5cf9167f919dfef964b1d149731ed04941e25ebf.tar tor-5cf9167f919dfef964b1d149731ed04941e25ebf.tar.gz | |
Use the standard _WIN32, not the Torism MS_WINDOWS or deprecated WIN32
This commit is completely mechanical; I used this perl script to make it:
#!/usr/bin/perl -w -i.bak -p
if (/^\s*\#/) {
s/MS_WINDOWS/_WIN32/g;
s/\bWIN32\b/_WIN32/g;
}
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/tor-fw-helper/tor-fw-helper-natpmp.c | 4 | ||||
| -rw-r--r-- | src/tools/tor-fw-helper/tor-fw-helper-upnp.c | 2 | ||||
| -rw-r--r-- | src/tools/tor-fw-helper/tor-fw-helper.c | 4 | ||||
| -rw-r--r-- | src/tools/tor-resolve.c | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/src/tools/tor-fw-helper/tor-fw-helper-natpmp.c b/src/tools/tor-fw-helper/tor-fw-helper-natpmp.c index a3a52d103..ed79fd252 100644 --- a/src/tools/tor-fw-helper/tor-fw-helper-natpmp.c +++ b/src/tools/tor-fw-helper/tor-fw-helper-natpmp.c @@ -9,14 +9,14 @@ #include "orconfig.h" #ifdef NAT_PMP -#ifdef MS_WINDOWS +#ifdef _WIN32 #define STATICLIB #endif #include <stdint.h> #include <stdio.h> #include <string.h> #include <errno.h> -#ifndef MS_WINDOWS +#ifndef _WIN32 #include <arpa/inet.h> #endif diff --git a/src/tools/tor-fw-helper/tor-fw-helper-upnp.c b/src/tools/tor-fw-helper/tor-fw-helper-upnp.c index c4b14a84e..442eae514 100644 --- a/src/tools/tor-fw-helper/tor-fw-helper-upnp.c +++ b/src/tools/tor-fw-helper/tor-fw-helper-upnp.c @@ -9,7 +9,7 @@ #include "orconfig.h" #ifdef MINIUPNPC -#ifdef MS_WINDOWS +#ifdef _WIN32 #define STATICLIB #endif #include <stdint.h> diff --git a/src/tools/tor-fw-helper/tor-fw-helper.c b/src/tools/tor-fw-helper/tor-fw-helper.c index 002239745..ea5ae7ffa 100644 --- a/src/tools/tor-fw-helper/tor-fw-helper.c +++ b/src/tools/tor-fw-helper/tor-fw-helper.c @@ -21,7 +21,7 @@ #include <time.h> #include <string.h> -#ifdef MS_WINDOWS +#ifdef _WIN32 #include <winsock2.h> #endif @@ -229,7 +229,7 @@ tor_fw_add_dir_port(tor_fw_options_t *tor_fw_options, static int network_init(void) { -#ifdef MS_WINDOWS +#ifdef _WIN32 /* This silly exercise is necessary before windows will allow * gethostbyname to work. */ WSADATA WSAData; diff --git a/src/tools/tor-resolve.c b/src/tools/tor-resolve.c index f1220d9d8..73352feac 100644 --- a/src/tools/tor-resolve.c +++ b/src/tools/tor-resolve.c @@ -32,7 +32,7 @@ #include <errno.h> #endif -#ifdef MS_WINDOWS +#ifdef _WIN32 #if defined(_MSC_VER) && (_MSC_VER <= 1300) #include <winsock.h> #else |