From 1b1d60e83a20412aeca3e440705df820979af03b Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
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/projections/bacon.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/projections/bacon.cpp')

diff --git a/src/projections/bacon.cpp b/src/projections/bacon.cpp
index 6c6350fe..74337ff2 100644
--- a/src/projections/bacon.cpp
+++ b/src/projections/bacon.cpp
@@ -4,6 +4,7 @@
 #include <errno.h>
 #include <math.h>
 
+#include "proj.h"
 #include "projects.h"
 
 
@@ -19,8 +20,8 @@ PROJ_HEAD(ortel, "Ortelius Oval") "\n\tMisc Sph, no inv";
 PROJ_HEAD(bacon, "Bacon Globular") "\n\tMisc Sph, no inv";
 
 
-static XY s_forward (LP lp, PJ *P) {           /* Spheroidal, forward */
-    XY xy = {0.0,0.0};
+static PJ_XY s_forward (PJ_LP lp, PJ *P) {           /* Spheroidal, forward */
+    PJ_XY xy = {0.0,0.0};
     struct pj_opaque *Q = static_cast<struct pj_opaque*>(P->opaque);
 	double ax, f;
 
-- 
cgit v1.2.3


From 8ab6f683cd316acf57bb89ed83932a267c5aa3c2 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Wed, 26 Dec 2018 14:58:26 +0100
Subject: Merge projects.h into proj_internal.h

---
 src/projections/bacon.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/projections/bacon.cpp')

diff --git a/src/projections/bacon.cpp b/src/projections/bacon.cpp
index 74337ff2..c713a989 100644
--- a/src/projections/bacon.cpp
+++ b/src/projections/bacon.cpp
@@ -5,7 +5,7 @@
 #include <math.h>
 
 #include "proj.h"
-#include "projects.h"
+#include "proj_internal.h"
 
 
 namespace { // anonymous namespace
-- 
cgit v1.2.3