diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2021-11-20 00:36:11 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-20 00:36:11 +0100 |
| commit | dbf55df332e62539408eef8b30dc5ce315ce3891 (patch) | |
| tree | 287763ad4a26083a1740182d5b5e27b768ca1aa2 | |
| parent | 81ef87fb1f8bfb01d6541b12dda9a310d1ca596c (diff) | |
| parent | 59a36d6904c167a51d877dc7674b662c0e417c1b (diff) | |
| download | PROJ-dbf55df332e62539408eef8b30dc5ce315ce3891.tar.gz PROJ-dbf55df332e62539408eef8b30dc5ce315ce3891.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 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 <exception> #include <map> #include <memory> |