diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2021-11-20 00:36:11 +0100 |
|---|---|---|
| committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2021-11-20 00:08:28 +0000 |
| commit | acfa9ce91f45b0afd58a7b6a6032c2740d571c9e (patch) | |
| tree | 289bf6a61676a674eef323d2cce9c3cdded80949 | |
| parent | 0510077777f6f04d6e8207b4a67f362fc1cc803e (diff) | |
| download | PROJ-acfa9ce91f45b0afd58a7b6a6032c2740d571c9e.tar.gz PROJ-acfa9ce91f45b0afd58a7b6a6032c2740d571c9e.zip | |
Merge pull request #2949 from jschueller/patch-1
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> |