From 59a36d6904c167a51d877dc7674b662c0e417c1b Mon Sep 17 00:00:00 2001 From: Julien Schueller Date: Fri, 19 Nov 2021 17:56:49 +0100 Subject: Fix windows.h conflict with Criterion::STRICT MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit If window.h is included in the same compilation unit we can expect this kind of errors: ``` util.hpp:348:15: error: expected identifier before ‘,’ token 348 | STRICT, ``` --- include/proj/util.hpp | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'include') diff --git a/include/proj/util.hpp b/include/proj/util.hpp index 97be4c16..abe289e9 100644 --- a/include/proj/util.hpp +++ b/include/proj/util.hpp @@ -33,6 +33,11 @@ #error Must have C++11 or newer. #endif +// windows.h can confict with Criterion::STRICT +#ifdef STRICT +#undef STRICT +#endif + #include #include #include -- cgit v1.2.3