diff options
| author | Frank Warmerdam <warmerdam@pobox.com> | 2002-07-08 02:32:05 +0000 |
|---|---|---|
| committer | Frank Warmerdam <warmerdam@pobox.com> | 2002-07-08 02:32:05 +0000 |
| commit | 22b01721aee54803d0d0d5566e4a9b2ef1384382 (patch) | |
| tree | 1a2f1b797d3c9549518a5cc778201f1366e10e88 /src/geodesic.h | |
| parent | d26cb6597ecd1c6b612d0159651cd607f9003a09 (diff) | |
| download | PROJ-22b01721aee54803d0d0d5566e4a9b2ef1384382.tar.gz PROJ-22b01721aee54803d0d0d5566e4a9b2ef1384382.zip | |
ensure clean C++ builds
git-svn-id: http://svn.osgeo.org/metacrs/proj/trunk@1025 4e78687f-474d-0410-85f9-8d5e500ac6b2
Diffstat (limited to 'src/geodesic.h')
| -rw-r--r-- | src/geodesic.h | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/src/geodesic.h b/src/geodesic.h index 825b6925..268cff59 100644 --- a/src/geodesic.h +++ b/src/geodesic.h @@ -6,9 +6,13 @@ static char GEODESIC_H_ID[] = "@(#)geodesic.h 4.3 95/08/19 GIE REL"; extern "C" { #endif -extern double dmstor(); -double proj_strtod(const char *, char **); -struct geodesic { +#ifndef _IN_GEOD_SET +# define GEOD_EXTERN extern +#else +# define GEOD_EXTERN +#endif + +GEOD_EXTERN struct geodesic { double A; double LAM1, PHI1, ALPHA12; double LAM2, PHI2, ALPHA21; @@ -33,13 +37,13 @@ struct geodesic { # define f64 GEODESIC.FLAT64 # define ellipse GEODESIC.ELLIPSE - int -n_alpha, n_S; - double -to_meter, fr_meter, del_alpha; + +GEOD_EXTERN int n_alpha, n_S; +GEOD_EXTERN double to_meter, fr_meter, del_alpha; + void geod_set(int, char **); void geod_for(void); -void geod_prefor(void); +void geod_pre(void); void geod_inv(void); #ifdef __cplusplus |