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/nad_intr.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'src/nad_intr.cpp') diff --git a/src/nad_intr.cpp b/src/nad_intr.cpp index 1f9d1e0c..b5f61db7 100644 --- a/src/nad_intr.cpp +++ b/src/nad_intr.cpp @@ -2,6 +2,7 @@ #define PJ_LIB__ #include "proj_internal.h" #include "proj_math.h" +#include "proj.h" #include "projects.h" LP -- 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/nad_intr.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/nad_intr.cpp') diff --git a/src/nad_intr.cpp b/src/nad_intr.cpp index b5f61db7..92d3292b 100644 --- a/src/nad_intr.cpp +++ b/src/nad_intr.cpp @@ -5,9 +5,8 @@ #include "proj.h" #include "projects.h" - LP -nad_intr(LP t, struct CTABLE *ct) { - LP val, frct; +PJ_LP nad_intr(PJ_LP t, struct CTABLE *ct) { + PJ_LP val, frct; ILP indx; double m00, m10, m01, m11; FLP *f00, *f10, *f01, *f11; -- 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/nad_intr.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/nad_intr.cpp') diff --git a/src/nad_intr.cpp b/src/nad_intr.cpp index 92d3292b..2c301ef8 100644 --- a/src/nad_intr.cpp +++ b/src/nad_intr.cpp @@ -3,7 +3,7 @@ #include "proj_internal.h" #include "proj_math.h" #include "proj.h" -#include "projects.h" +#include "proj_internal.h" PJ_LP nad_intr(PJ_LP t, struct CTABLE *ct) { PJ_LP val, frct; -- cgit v1.2.3