Merge remote-tracking branch 'origin/master'

1 files changed, 5 insertions, 6 deletions

diff --git a/src/projections/tobmerc.cpp b/src/projections/tobmerc.cpp
index 95960097..7215f0db 100644
--- a/src/projections/tobmerc.cpp
+++ b/src/projections/tobmerc.cpp
@@ -3,10 +3,9 @@
 #include <float.h>
 #include <math.h>
 
-#include "proj_internal.h"
 #include "proj.h"
-#include "proj_math.h"
 #include "proj_internal.h"
+#include "proj_math.h"
 
 PROJ_HEAD(tobmerc, "Tobler-Mercator") "\n\tCyl, Sph";
 
@@ -19,7 +18,7 @@ static double logtanpfpim1(double x) {       /* log(tan(x/2 + M_FORTPI)) */
     return log(tan(M_FORTPI + .5 * x));
 }
 
-static PJ_XY s_forward (PJ_LP lp, PJ *P) {           /* Spheroidal, forward */
+static PJ_XY tobmerc_s_forward (PJ_LP lp, PJ *P) {           /* Spheroidal, forward */
     PJ_XY xy = {0.0, 0.0};
     double cosphi;
 
@@ -34,7 +33,7 @@ static PJ_XY s_forward (PJ_LP lp, PJ *P) {           /* Spheroidal, forward */
     return xy;
 }
 
-static PJ_LP s_inverse (PJ_XY xy, PJ *P) {           /* Spheroidal, inverse */
+static PJ_LP tobmerc_s_inverse (PJ_XY xy, PJ *P) {           /* Spheroidal, inverse */
     PJ_LP lp = {0.0, 0.0};
     double cosphi;
 
@@ -45,7 +44,7 @@ static PJ_LP s_inverse (PJ_XY xy, PJ *P) {           /* Spheroidal, inverse */
 }
 
 PJ *PROJECTION(tobmerc) {
-    P->inv = s_inverse;
-    P->fwd = s_forward;
+    P->inv = tobmerc_s_inverse;
+    P->fwd = tobmerc_s_forward;
     return P;
 }