No longer declare pj_prime_meridians, pj_ellps and pj_units as extern…

… C, but static'ify them
rouault · Oct 17, 2018 · 35eb793 · 35eb793
1 parent 73f7c0e
commit 35eb793
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/pj_datums.c b/src/pj_datums.c
@@ -73,7 +73,7 @@ struct PJ_DATUMS *pj_get_datums_ref()
     return (struct PJ_DATUMS *)pj_datums;
 }
 
-C_NAMESPACE_VAR const struct PJ_PRIME_MERIDIANS pj_prime_meridians[] = {
+static const struct PJ_PRIME_MERIDIANS pj_prime_meridians[] = {
     /* id        definition                         */
     /* --        ----------                         */
     {"greenwich", "0dE"},

diff --git a/src/pj_ellps.c b/src/pj_ellps.c
@@ -5,7 +5,7 @@
 #include "proj.h"
 #include "projects.h"
 
-C_NAMESPACE_VAR const struct PJ_ELLPS
+static const struct PJ_ELLPS
 pj_ellps[] = {
 {"MERIT",	"a=6378137.0",		"rf=298.257",		"MERIT 1983"},
 {"SGS85",	"a=6378136.0",		"rf=298.257",		"Soviet Geodetic System 85"},

diff --git a/src/pj_units.c b/src/pj_units.c
@@ -10,7 +10,7 @@
 /* Field 2 that contains the multiplier to convert named units to meters
 ** may be expressed by either a simple floating point constant or a
 ** numerator/denomenator values (e.g. 1/1000) */
-C_NAMESPACE_VAR const struct PJ_UNITS
+static const struct PJ_UNITS
 pj_units[] = {
     {"km",      "1000",                 "Kilometer",                    1000.0},
     {"m",       "1",                    "Meter",                        1.0},