Commit e1176ece authored by Nick Mathewson's avatar Nick Mathewson 🐘
Browse files

r11992@catbus: nickm | 2007-02-28 12:46:32 -0500 

 compile fix on mingw: mingw does not define _MSC_VER.


svn:r9682
parent deef370a

src/common/compat.h

+1 −1
Changes for src/common/compat.h: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
#define WIN32_WINNT 0x400

#define _WIN32_WINNT 0x400

#define WIN32_LEAN_AND_MEAN

#if (_MSC_VER <= 1300)

#if defined(_MSC_VER) && (_MSC_VER <= 1300)

#include <winsock.h>

#else

#include <winsock2.h>

src/common/util.c

+1 −1
Changes for src/common/util.c: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -541,7 +541,7 @@ tor_parse_uint64(const char *s, int base, uint64_t min, 
#ifdef HAVE_STRTOULL

  r = (uint64_t)strtoull(s, &endptr, base);

#elif defined(MS_WINDOWS)

#if _MSC_VER < 1300

#if defined(_MSC_VER) && _MSC_VER < 1300

  tor_assert(base <= 10);

  r = (uint64_t)_atoi64(s);

  endptr = (char*)s;

src/tools/tor-resolve.c

+1 −1
Changes for src/tools/tor-resolve.c: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ 
#endif



#ifdef MS_WINDOWS

#if (_MSC_VER <= 1300)

#if defined(_MSC_VER) && (_MSC_VER <= 1300)

#include <winsock.h>

#else

#include <winsock2.h>