Merge pull request #2950 from OSGeo/backport-2949-to-8.2

[Backport 8.2] Fix windows.h conflict with Criterion::STRICT
OSGeo · Nov 20, 2021 · 30f059a · 30f059a
2 parents 2f2c150 + acfa9ce
commit 30f059a
Showing 1 changed file with 5 additions and 0 deletions.
diff --git 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 <exception>
 #include <map>
 #include <memory>