summaryrefslogtreecommitdiff
path: root/src/common/tortls.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2012-01-31 10:59:42 -0500
committerNick Mathewson <nickm@torproject.org>2012-01-31 15:48:47 -0500
commit5cf9167f919dfef964b1d149731ed04941e25ebf (patch)
tree37668dde9fd4c68d80cb1bde90523b55fba4b226 /src/common/tortls.c
parent23054543278a8ee5db6d8dae3b3a96e2b2fd5377 (diff)
downloadtor-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/common/tortls.c')
-rw-r--r--src/common/tortls.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/common/tortls.c b/src/common/tortls.c
index 570dd005fd..26d37145a3 100644
--- a/src/common/tortls.c
+++ b/src/common/tortls.c
@@ -21,7 +21,7 @@
#endif
#include <assert.h>
-#ifdef MS_WINDOWS /*wrkard for dtls1.h >= 0.9.8m of "#include <winsock.h>"*/
+#ifdef _WIN32 /*wrkard for dtls1.h >= 0.9.8m of "#include <winsock.h>"*/
#ifndef WIN32_WINNT
#define WIN32_WINNT 0x400
#endif
@@ -333,7 +333,7 @@ tls_log_errors(tor_tls_t *tls, int severity, int domain, const char *doing)
static int
tor_errno_to_tls_error(int e)
{
-#if defined(MS_WINDOWS)
+#if defined(_WIN32)
switch (e) {
case WSAECONNRESET: // most common
return TOR_TLS_ERROR_CONNRESET;