From 302c8a89f01bd9f14d226b4aeaac08a5e34a8cc6 Mon Sep 17 00:00:00 2001 From: Frank Warmerdam Date: Thu, 12 Jan 2006 22:29:01 +0000 Subject: make geocent.c globals static to avoid conflicts git-svn-id: http://svn.osgeo.org/metacrs/proj/trunk@1316 4e78687f-474d-0410-85f9-8d5e500ac6b2 --- ChangeLog | 5 +++++ src/geocent.c | 15 +++++++++------ 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1cdb7f46..d0fe2857 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-01-12 Frank Warmerdam + + * geocent.c: Make global variables static. Amoung other things + this avoids conflicts for apps that link in geotrans. + 2005-12-04 Frank Warmerdam * src/pj_transform.c: improve code with some symbolic names. 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. -- cgit v1.2.3