Merge remote-tracking branch 'origin/master'

1 files changed, 4 insertions, 4 deletions

diff --git a/src/projections/goode.cpp b/src/projections/goode.cpp
index 802df90c..c716649d 100644
--- a/src/projections/goode.cpp
+++ b/src/projections/goode.cpp
@@ -21,7 +21,7 @@ struct pj_opaque {
 } // anonymous namespace
 
 
-static PJ_XY s_forward (PJ_LP lp, PJ *P) {           /* Spheroidal, forward */
+static PJ_XY goode_s_forward (PJ_LP lp, PJ *P) {           /* Spheroidal, forward */
     PJ_XY xy;
     struct pj_opaque *Q = static_cast<struct pj_opaque*>(P->opaque);
 
@@ -35,7 +35,7 @@ static PJ_XY s_forward (PJ_LP lp, PJ *P) {           /* Spheroidal, forward */
 }
 
 
-static PJ_LP s_inverse (PJ_XY xy, PJ *P) {           /* Spheroidal, inverse */
+static PJ_LP goode_s_inverse (PJ_XY xy, PJ *P) {           /* Spheroidal, inverse */
     PJ_LP lp;
     struct pj_opaque *Q = static_cast<struct pj_opaque*>(P->opaque);
 
@@ -77,8 +77,8 @@ PJ *PROJECTION(goode) {
     if (!(Q->sinu = pj_sinu(Q->sinu)) || !(Q->moll = pj_moll(Q->moll)))
         return destructor (P, ENOMEM);
 
-    P->fwd = s_forward;
-    P->inv = s_inverse;
+    P->fwd = goode_s_forward;
+    P->inv = goode_s_inverse;
 
     return P;
 }