Subject: Silence various warnings when doing a 64-bit build with MSVC: Those warnings can only _really_ be fixed in "novem" (so, don't silence them there)

From: "jan.nijtmans" <[email-masked]>
Date: Wed, 12 Jun 2013 10:24:52 +0000

---
 win/tclWinPort.h | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/win/tclWinPort.h b/win/tclWinPort.h
index 987d45b..b545a09 100644
--- a/win/tclWinPort.h
+++ b/win/tclWinPort.h
@@ -350,9 +350,9 @@ typedef DWORD_PTR * PDWORD_PTR;
 
 #if defined(_MSC_VER) || defined(__MINGW32__)
 #   define environ _environ
-#    if defined(_MSC_VER) && (_MSC_VER < 1600)
+#   if defined(_MSC_VER) && (_MSC_VER < 1600)
 #	define hypot _hypot
-#    endif
+#   endif
 #   define exception _exception
 #   undef EDEADLOCK
 #   if defined(__MINGW32__) && !defined(__MSVCRT__)
@@ -381,8 +381,10 @@ typedef DWORD_PTR * PDWORD_PTR;
  * including the *printf family and others. Tell it to shut up.
  * (_MSC_VER is 1200 for VC6, 1300 or 1310 for vc7.net, 1400 for 8.0)
  */
-#if _MSC_VER >= 1400
-#pragma warning(disable:4996)
+#if defined(_MSC_VER) && (_MSC_VER >= 1400)
+#   pragma warning(disable:4244)
+#   pragma warning(disable:4267)
+#   pragma warning(disable:4996)
 #endif

-- 
cgit v0.12