Subject: Fix [42b8083613]

From: "jan.nijtmans" <[email-masked]>
Date: Mon, 17 Jun 2013 17:03:49 +0000

---
 win/tclWinFile.c |  4 ++++
 win/tclWinPort.h | 12 ++++--------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/win/tclWinFile.c b/win/tclWinFile.c
index 1d9f93a..31fa603 100644
--- a/win/tclWinFile.c
+++ b/win/tclWinFile.c
@@ -18,6 +18,10 @@
 #include <shlobj.h>
 #include <lm.h>		/* For TclpGetUserHome(). */
 
+#if defined(_MSC_VER)
+#   define vsnprintf _vsnprintf
+#endif
+
 /*
  * The number of 100-ns intervals between the Windows system epoch (1601-01-01
  * on the proleptic Gregorian calendar) and the Posix epoch (1970-01-01).
diff --git a/win/tclWinPort.h b/win/tclWinPort.h
index 026cf9e..61f149b 100644
--- a/win/tclWinPort.h
+++ b/win/tclWinPort.h
@@ -466,16 +466,12 @@ 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 defined(_MSC_VER)
-#   if _MSC_VER >= 1400
-#	pragma warning(disable:4244)
-#	pragma warning(disable:4267)
-#	pragma warning(disable:4996)
-#   endif
-#   define vsnprintf _vsnprintf
+#if defined(_MSC_VER) && (_MSC_VER >= 1400)
+#   pragma warning(disable:4244)
+#   pragma warning(disable:4267)
+#   pragma warning(disable:4996)
 #endif
 
-
 /*
  *---------------------------------------------------------------------------
  * The following macros and declarations represent the interface between
-- 
cgit v0.12