diff options
| author | Kristian Evers <kristianevers@gmail.com> | 2019-02-26 22:07:24 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-26 22:07:24 +0100 |
| commit | f78661f84d8c0d7912b31a1b19c2a0cd4f85d061 (patch) | |
| tree | 360bc573d8ec5af701eae8cc1f65cd76fe95ad7a /include | |
| parent | 2db1400b34c219764b0000d0ad7b0f589f053432 (diff) | |
| parent | c9b27a248d3ed9964b6ac0847a83eba383b62537 (diff) | |
| download | PROJ-f78661f84d8c0d7912b31a1b19c2a0cd4f85d061.tar.gz PROJ-f78661f84d8c0d7912b31a1b19c2a0cd4f85d061.zip | |
Merge pull request #1293 from rouault/fix_netbsd8_compilation
mutex.cpp: remove _XOPEN_SOURCE definition that causes compilation problem on netBSD 8 and is useless on Linux
Diffstat (limited to 'include')
| -rw-r--r-- | include/proj/internal/io_internal.hpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/proj/internal/io_internal.hpp b/include/proj/internal/io_internal.hpp index be6a11bd..3b0e7c0f 100644 --- a/include/proj/internal/io_internal.hpp +++ b/include/proj/internal/io_internal.hpp @@ -76,7 +76,8 @@ class WKTConstants { static const std::string SCALEUNIT; static const std::string TIMEUNIT; static const std::string ELLIPSOID; - static const std::string CS; + // underscore, since there is a CS macro in Solaris system headers + static const std::string CS_; static const std::string ID; static const std::string PROJCRS; static const std::string BASEGEODCRS; |