diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2018-10-17 15:32:50 +0200 |
|---|---|---|
| committer | Even Rouault <even.rouault@spatialys.com> | 2018-10-17 15:32:50 +0200 |
| commit | 35eb793ff6b411cc88fc578b4d99e34cd25ca613 (patch) | |
| tree | f2c46364cb83db11bd7a8f2c08647d65d1142ae0 /src | |
| parent | 73f7c0eead0cf6fdcf247cd9368cc7d5f72a1f2c (diff) | |
| download | PROJ-35eb793ff6b411cc88fc578b4d99e34cd25ca613.tar.gz PROJ-35eb793ff6b411cc88fc578b4d99e34cd25ca613.zip | |
No longer declare pj_prime_meridians, pj_ellps and pj_units as extern C, but static'ify them
Diffstat (limited to 'src')
| -rw-r--r-- | src/pj_datums.c | 2 | ||||
| -rw-r--r-- | src/pj_ellps.c | 2 | ||||
| -rw-r--r-- | src/pj_units.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/pj_datums.c b/src/pj_datums.c index b5d27c53..2951b7bd 100644 --- 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 index a9d98bbc..5128d47e 100644 --- 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 index a79ba1ae..de43f986 100644 --- 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}, |