From acfa9ce91f45b0afd58a7b6a6032c2740d571c9e Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Sat, 20 Nov 2021 00:36:11 +0100
Subject: [PATCH] Merge pull request #2949 from jschueller/patch-1

Fix windows.h conflict with Criterion::STRICT
---
 include/proj/util.hpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/include/proj/util.hpp b/include/proj/util.hpp
index 3f5e208eae..c350b6ee06 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 <exception>
 #include <map>
 #include <memory>