From 7806af71e85f17c5bce0eb9d070fea1dbb40f38d Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Wed, 25 Sep 2019 13:55:33 +0000 Subject: hatano/mbtfpp: do not use CS to fix Solaris build issue Patches proj-6.2.0-hanato.gpatch and proj-6.2.0-mbtfpp.gpatch from Eric Dechaux --- src/projections/hatano.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/projections/hatano.cpp') diff --git a/src/projections/hatano.cpp b/src/projections/hatano.cpp index 6c125d2e..29a01f80 100644 --- a/src/projections/hatano.cpp +++ b/src/projections/hatano.cpp @@ -11,7 +11,7 @@ PROJ_HEAD(hatano, "Hatano Asymmetrical Equal Area") "\n\tPCyl, Sph"; #define EPS 1e-7 #define ONETOL 1.000001 #define CN 2.67595 -#define CS 2.43763 +#define CSz 2.43763 #define RCN 0.37369906014686373063 #define RCS 0.41023453108141924738 #define FYCN 1.75859 @@ -28,7 +28,7 @@ static PJ_XY hatano_s_forward (PJ_LP lp, PJ *P) { /* Spheroidal, forwa int i; (void) P; - c = sin(lp.phi) * (lp.phi < 0. ? CS : CN); + c = sin(lp.phi) * (lp.phi < 0. ? CSz : CN); for (i = NITER; i; --i) { lp.phi -= th1 = (lp.phi + sin(lp.phi) - c) / (1. + cos(lp.phi)); if (fabs(th1) < EPS) break; -- cgit v1.2.3