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/or/transports.c | |
| parent | 23054543278a8ee5db6d8dae3b3a96e2b2fd5377 (diff) | |
| download | tor-5cf9167f919dfef964b1d149731ed04941e25ebf.tar.gz tor-5cf9167f919dfef964b1d149731ed04941e25ebf.zip | |
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/or/transports.c')
| -rw-r--r-- | src/or/transports.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/or/transports.c b/src/or/transports.c index 0bc67ba98c..3e5501e0e1 100644 --- a/src/or/transports.c +++ b/src/or/transports.c @@ -91,7 +91,7 @@ #include "util.h" #include "router.h" -#ifdef MS_WINDOWS +#ifdef _WIN32 static void set_managed_proxy_environment(LPVOID *envp, const managed_proxy_t *mp); #else @@ -263,7 +263,7 @@ launch_managed_proxy(managed_proxy_t *mp) { int retval; -#ifdef MS_WINDOWS +#ifdef _WIN32 LPVOID envp=NULL; @@ -349,7 +349,7 @@ pt_configure_remaining_proxies(void) } SMARTLIST_FOREACH_END(mp); } -#ifdef MS_WINDOWS +#ifdef _WIN32 /** Attempt to continue configuring managed proxy <b>mp</b>. */ static void @@ -406,7 +406,7 @@ configure_proxy(managed_proxy_t *mp) smartlist_free(lines); } -#else /* MS_WINDOWS */ +#else /* _WIN32 */ /** Attempt to continue configuring managed proxy <b>mp</b>. */ static void @@ -451,7 +451,7 @@ configure_proxy(managed_proxy_t *mp) } } -#endif /* MS_WINDOWS */ +#endif /* _WIN32 */ /** Register server managed proxy <b>mp</b> transports to state */ static void @@ -941,7 +941,7 @@ get_bindaddr_for_server_proxy(const managed_proxy_t *mp) return bindaddr_result; } -#ifdef MS_WINDOWS +#ifdef _WIN32 /** Prepare the environment <b>envp</b> of managed proxy <b>mp</b>. * <b>envp</b> is allocated on the heap and should be freed by the @@ -1043,7 +1043,7 @@ set_managed_proxy_environment(LPVOID *envp, const managed_proxy_t *mp) smartlist_free(envs); } -#else /* MS_WINDOWS */ +#else /* _WIN32 */ /** Prepare the environment <b>envp</b> of managed proxy <b>mp</b>. * <b>envp</b> is allocated on the heap and should be freed by the @@ -1104,7 +1104,7 @@ set_managed_proxy_environment(char ***envp, const managed_proxy_t *mp) return r; } -#endif /* MS_WINDOWS */ +#endif /* _WIN32 */ /** Create and return a new managed proxy for <b>transport</b> using * <b>proxy_argv</b>. If <b>is_server</b> is true, it's a server |