diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2021-11-20 11:26:46 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-20 11:26:46 +0100 |
| commit | 30f059a018a6ae862c18ec128e0ace14193ad5ee (patch) | |
| tree | 8bff759e9fac3a64740d3c973d02a3d4a1b59942 | |
| parent | 2f2c150a52acd21cc23962d618b451a517c44948 (diff) | |
| parent | acfa9ce91f45b0afd58a7b6a6032c2740d571c9e (diff) | |
| download | PROJ-30f059a018a6ae862c18ec128e0ace14193ad5ee.tar.gz PROJ-30f059a018a6ae862c18ec128e0ace14193ad5ee.zip | |
Merge pull request #2950 from OSGeo/backport-2949-to-8.2
[Backport 8.2] Fix windows.h conflict with Criterion::STRICT
| -rw-r--r-- | include/proj/util.hpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/proj/util.hpp b/include/proj/util.hpp index 3f5e208e..c350b6ee 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> |