From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 14 May 2012 16:22:51 +0000 (-0400)
Subject: We do not need to define _WIN32 by hand; MSVC does that for us
X-Git-Tag: tor-0.2.3.16-alpha~76
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c5e87ef234e2feb7ac892f31c4c7eaedc56b06b2;p=thirdparty%2Ftor.git

We do not need to define _WIN32 by hand; MSVC does that for us

Bug 5858; fix on 0.2.3.12-alpha
---

diff --git a/changes/bug5858 b/changes/bug5858
new file mode 100644
index 0000000000..aa1e8bba1d
--- /dev/null
+++ b/changes/bug5858
@@ -0,0 +1,4 @@
+  o Minor bugfixes:
+    - Remove bogus definition of "_WIN32" from src/win32/orconfig.h, to
+      unbreak the MSVC build. Fies bug 5858; bugfix on 0.2.3.12-alpha.
+
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index f6bbf8bc4e..a08d0c6b58 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -3,7 +3,6 @@
  */
 
 /* Windows-only defines. */
-#define _WIN32
 #define CONFDIR ""
 
 /* Define to 1 if you have the <arpa/inet.h> header file. */