From 9bb2d68766c5cc064352cc89045447949e090508 Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Wed, 26 Dec 2018 12:51:24 +0100 Subject: projects.h: remove #ifdef __cpluplus test since it must now be included from C++ file due to C++ objects in struct PJconsts --- src/deriv.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'src/deriv.cpp') diff --git a/src/deriv.cpp b/src/deriv.cpp index 0e285265..72a69440 100644 --- a/src/deriv.cpp +++ b/src/deriv.cpp @@ -3,6 +3,7 @@ #include +#include "proj.h" #include "projects.h" int pj_deriv(LP lp, double h, const PJ *P, struct DERIVS *der) { -- cgit v1.2.3 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/deriv.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/deriv.cpp') diff --git a/src/deriv.cpp b/src/deriv.cpp index 72a69440..3839809e 100644 --- a/src/deriv.cpp +++ b/src/deriv.cpp @@ -6,8 +6,8 @@ #include "proj.h" #include "projects.h" -int pj_deriv(LP lp, double h, const PJ *P, struct DERIVS *der) { - XY t; +int pj_deriv(PJ_LP lp, double h, const PJ *P, struct DERIVS *der) { + PJ_XY t; /* get rid of constness until we can do it for real */ PJ *Q = (PJ *) P; if (nullptr==Q->fwd) -- 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/deriv.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/deriv.cpp') diff --git a/src/deriv.cpp b/src/deriv.cpp index 3839809e..bc7fa19e 100644 --- a/src/deriv.cpp +++ b/src/deriv.cpp @@ -4,7 +4,7 @@ #include #include "proj.h" -#include "projects.h" +#include "proj_internal.h" int pj_deriv(PJ_LP lp, double h, const PJ *P, struct DERIVS *der) { PJ_XY t; -- cgit v1.2.3