diff options
| author | dgp <dgp@users.sourceforge.net> | 2015-03-13 16:55:39 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2015-03-13 16:55:39 (GMT) |
| commit | b2c41c81e4080d7e8636328c58f27ed15b70c29b (patch) | |
| tree | c493fb55fe19d0b734657ddfc18dab8402b23b14 | |
| parent | 0e5a1e2642d9893498118c3367c62e390f1d482d (diff) | |
| download | tcl-b2c41c81e4080d7e8636328c58f27ed15b70c29b.zip tcl-b2c41c81e4080d7e8636328c58f27ed15b70c29b.tar.gz tcl-b2c41c81e4080d7e8636328c58f27ed15b70c29b.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.h | 10 | ||||
| -rw-r--r-- | 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 */ |