diff options
| author | Frank Warmerdam <warmerdam@pobox.com> | 2002-05-30 13:40:55 +0000 |
|---|---|---|
| committer | Frank Warmerdam <warmerdam@pobox.com> | 2002-05-30 13:40:55 +0000 |
| commit | f94b4a77d96ede45af76ada8223b915cbb68023d (patch) | |
| tree | 0cfded56aa946ca16ebf81f62057e099bf400db9 /src/geodesic.h | |
| parent | fff37a106352de2e859829710ba2f8e272cd41d8 (diff) | |
| download | PROJ-f94b4a77d96ede45af76ada8223b915cbb68023d.tar.gz PROJ-f94b4a77d96ede45af76ada8223b915cbb68023d.zip | |
use less conflicting names for a, S and f
git-svn-id: http://svn.osgeo.org/metacrs/proj/trunk@1015 4e78687f-474d-0410-85f9-8d5e500ac6b2
Diffstat (limited to 'src/geodesic.h')
| -rw-r--r-- | src/geodesic.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/geodesic.h b/src/geodesic.h index fc161f3b..825b6925 100644 --- a/src/geodesic.h +++ b/src/geodesic.h @@ -16,21 +16,23 @@ struct geodesic { double ONEF, FLAT, FLAT2, FLAT4, FLAT64; int ELLIPSE; } GEODESIC; -# define a GEODESIC.A + +# define geod_a GEODESIC.A # define lam1 GEODESIC.LAM1 # define phi1 GEODESIC.PHI1 # define al12 GEODESIC.ALPHA12 # define lam2 GEODESIC.LAM2 # define phi2 GEODESIC.PHI2 # define al21 GEODESIC.ALPHA21 -# define S GEODESIC.DIST -# define f GEODESIC.FLAT +# define geod_S GEODESIC.DIST +# define geod_f GEODESIC.FLAT # define onef GEODESIC.ONEF # define f2 GEODESIC.FLAT2 # define f4 GEODESIC.FLAT4 # define ff2 GEODESIC.FLAT4 # define f64 GEODESIC.FLAT64 # define ellipse GEODESIC.ELLIPSE + int n_alpha, n_S; double |