summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2015-03-13 16:55:39 (GMT)
committerdgp <dgp@users.sourceforge.net>2015-03-13 16:55:39 (GMT)
commita5e96da45818cdb2ed907232f501bebd1283b8b2 (patch)
treec493fb55fe19d0b734657ddfc18dab8402b23b14
parente54038086f492625fa4870aa220ad7b4b746b87d (diff)
downloadtcl-a5e96da45818cdb2ed907232f501bebd1283b8b2.zip
tcl-a5e96da45818cdb2ed907232f501bebd1283b8b2.tar.gz
tcl-a5e96da45818cdb2ed907232f501bebd1283b8b2.tar.bz2
The STRICT directive influences how #include "windows.h" works.
This is not a generic concern. Move it over the tclWinPort.h.
-rw-r--r--generic/tcl.h10
-rw-r--r--win/tclWinPort.h2
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 */