From a5e96da45818cdb2ed907232f501bebd1283b8b2 Mon Sep 17 00:00:00 2001 From: dgp 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 +#undef STRICT #undef WIN32_LEAN_AND_MEAN /* Compatibility to older visual studio / windows platform SDK */ -- cgit v0.12 From eb1bcbe68ddda0e199b55e34cf2b1360dbd89d59 Mon Sep 17 00:00:00 2001 From: dgp Date: Fri, 13 Mar 2015 17:14:16 +0000 Subject: Upon further review, due the order of #include of headers, we do not have a history of a #define STRICT active when the #include "windows.h" in tclWinPort.h happens. Don't want to start something new now. --- win/tclAppInit.c | 2 ++ win/tclWinPort.h | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/win/tclAppInit.c b/win/tclAppInit.c index a6c1a67..e06eaf5 100644 --- a/win/tclAppInit.c +++ b/win/tclAppInit.c @@ -16,7 +16,9 @@ #include "tcl.h" #define WIN32_LEAN_AND_MEAN +#define STRICT /* See MSDN Article Q83456 */ #include +#undef STRICT #undef WIN32_LEAN_AND_MEAN #include #include diff --git a/win/tclWinPort.h b/win/tclWinPort.h index 1b23ee3..ca6b2bf 100644 --- a/win/tclWinPort.h +++ b/win/tclWinPort.h @@ -33,9 +33,7 @@ #endif #define WIN32_LEAN_AND_MEAN -#define STRICT /* See MSDN Article Q83456 */ #include -#undef STRICT #undef WIN32_LEAN_AND_MEAN /* Compatibility to older visual studio / windows platform SDK */ -- cgit v0.12