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

 compile fix on mingw: mingw does not define _MSC_VER.

svn:r9682

diff --git a/src/common/compat.h b/src/common/compat.h
index 7cfb6a5e457642b6c8d0aa77249ff7e9b81e919b..b7eaf75ea3ccccb3d25dbe6d705cbcb98fc7ebbf 100644 (file)
--- a/src/common/compat.h
+++ b/src/common/compat.h
@@ -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>

diff --git a/src/common/util.c b/src/common/util.c
index b042963c57cdd6b489494089e4ac277fe14d7fec..a16d41fad7b1ded0522cec207b08e08e656ed265 100644 (file)
--- a/src/common/util.c
+++ b/src/common/util.c
@@ -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;

diff --git a/src/tools/tor-resolve.c b/src/tools/tor-resolve.c
index f24bff497b28cb0195d198356429c77163db03ab..25a14a46601d5f15ca73d885c33c6296a1a0e6d0 100644 (file)
--- a/src/tools/tor-resolve.c
+++ b/src/tools/tor-resolve.c
@@ -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>