From b2c41c81e4080d7e8636328c58f27ed15b70c29b Mon Sep 17 00:00:00 2001
From: dgp <dgp@users.sourceforge.net>
Date: Fri, 13 Mar 2015 16:55:39 +0000
Subject: The STRICT directive influences how #include "windows.h" works. This
 is not a generic concern.  Move it over the tclWinPort.h.

---
 generic/tcl.h    | 10 ----------
 win/tclWinPort.h |  2 ++
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/generic/tcl.h b/generic/tcl.h
index ae425bb..f09315b 100644
--- a/generic/tcl.h
+++ b/generic/tcl.h
@@ -77,16 +77,6 @@ extern "C" {
 #endif
 
 /*
- * STRICT: See MSDN Article Q83456
- */
-
-#ifdef _WIN32
-#   ifndef STRICT
-#	define STRICT
-#   endif
-#endif /* _WIN32 */
-
-/*
  * Utility macros: STRINGIFY takes an argument and wraps it in "" (double
  * quotation marks), JOIN joins two arguments.
  */
diff --git a/win/tclWinPort.h b/win/tclWinPort.h
index ca6b2bf..1b23ee3 100644
--- a/win/tclWinPort.h
+++ b/win/tclWinPort.h
@@ -33,7 +33,9 @@
 #endif
 
 #define WIN32_LEAN_AND_MEAN
+#define STRICT		/* See MSDN Article Q83456 */
 #include <windows.h>
+#undef STRICT
 #undef WIN32_LEAN_AND_MEAN
 
 /* Compatibility to older visual studio / windows platform SDK */
-- 
cgit v0.12