commit c5e87ef234e2feb7ac892f31c4c7eaedc56b06b2 Author: Nick Mathewson nickm@torproject.org Date: Mon May 14 12:22:51 2012 -0400

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

Bug 5858; fix on 0.2.3.12-alpha --- changes/bug5858 | 4 ++++ src/win32/orconfig.h | 1 - 2 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/changes/bug5858 b/changes/bug5858 new file mode 100644 index 0000000..aa1e8bb --- /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 f6bbf8b..a08d0c6 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. */