From 1b1d60e83a20412aeca3e440705df820979af03b Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Wed, 26 Dec 2018 14:22:34 +0100 Subject: projects.h: remove deprecated XY, XYZ, LP, LPZ, UV, UVW, projUV and projUVW structures --- src/iso19111/coordinateoperation.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/iso19111/coordinateoperation.cpp') diff --git a/src/iso19111/coordinateoperation.cpp b/src/iso19111/coordinateoperation.cpp index e9a9f434..6b6651da 100644 --- a/src/iso19111/coordinateoperation.cpp +++ b/src/iso19111/coordinateoperation.cpp @@ -41,7 +41,11 @@ #include "proj/internal/internal.hpp" #include "proj/internal/io_internal.hpp" +// PROJ include order is sensitive +// clang-format off +#include "proj.h" #include "projects.h" // M_PI +// clang-format on #include #include -- cgit v1.2.3 From 8ab6f683cd316acf57bb89ed83932a267c5aa3c2 Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Wed, 26 Dec 2018 14:58:26 +0100 Subject: Merge projects.h into proj_internal.h --- src/iso19111/coordinateoperation.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/iso19111/coordinateoperation.cpp') diff --git a/src/iso19111/coordinateoperation.cpp b/src/iso19111/coordinateoperation.cpp index 6b6651da..93314b85 100644 --- a/src/iso19111/coordinateoperation.cpp +++ b/src/iso19111/coordinateoperation.cpp @@ -44,7 +44,7 @@ // PROJ include order is sensitive // clang-format off #include "proj.h" -#include "projects.h" // M_PI +#include "proj_internal.h" // M_PI // clang-format on #include -- cgit v1.2.3