diff options
| author | Frank Warmerdam <warmerdam@pobox.com> | 2006-01-12 22:29:01 +0000 |
|---|---|---|
| committer | Frank Warmerdam <warmerdam@pobox.com> | 2006-01-12 22:29:01 +0000 |
| commit | 302c8a89f01bd9f14d226b4aeaac08a5e34a8cc6 (patch) | |
| tree | c39a738ff2c9f44c9b7b342e9d1885a676c2e0e6 /src/geocent.c | |
| parent | 8f16680e0302bd3cb901f871d9ca578e8a40fc9e (diff) | |
| download | PROJ-302c8a89f01bd9f14d226b4aeaac08a5e34a8cc6.tar.gz PROJ-302c8a89f01bd9f14d226b4aeaac08a5e34a8cc6.zip | |
make geocent.c globals static to avoid conflicts
git-svn-id: http://svn.osgeo.org/metacrs/proj/trunk@1316 4e78687f-474d-0410-85f9-8d5e500ac6b2
Diffstat (limited to 'src/geocent.c')
| -rw-r--r-- | src/geocent.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/geocent.c b/src/geocent.c index 925150e8..7da76c1d 100644 --- a/src/geocent.c +++ b/src/geocent.c @@ -65,6 +65,9 @@ * 25-02-97 Original Code * * $Log$ + * Revision 1.6 2006/01/12 22:29:01 fwarmerdam + * make geocent.c globals static to avoid conflicts + * * Revision 1.5 2004/10/25 15:34:36 fwarmerdam * make names of geodetic funcs from geotrans unique * @@ -109,13 +112,13 @@ * GLOBAL DECLARATIONS */ /* Ellipsoid parameters, default to WGS 84 */ -double Geocent_a = 6378137.0; /* Semi-major axis of ellipsoid in meters */ -double Geocent_b = 6356752.3142; /* Semi-minor axis of ellipsoid */ +static double Geocent_a = 6378137.0; /* Semi-major axis of ellipsoid in meters */ +static double Geocent_b = 6356752.3142; /* Semi-minor axis of ellipsoid */ -double Geocent_a2 = 40680631590769.0; /* Square of semi-major axis */ -double Geocent_b2 = 40408299984087.05; /* Square of semi-minor axis */ -double Geocent_e2 = 0.0066943799901413800; /* Eccentricity squared */ -double Geocent_ep2 = 0.00673949675658690300; /* 2nd eccentricity squared */ +static double Geocent_a2 = 40680631590769.0; /* Square of semi-major axis */ +static double Geocent_b2 = 40408299984087.05; /* Square of semi-minor axis */ +static double Geocent_e2 = 0.0066943799901413800; /* Eccentricity squared */ +static double Geocent_ep2 = 0.00673949675658690300; /* 2nd eccentricity squared */ /* * These state variables are for optimization purposes. The only function * that should modify them is Set_Geocentric_Parameters. |