diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2018-12-18 20:24:11 +0100 |
|---|---|---|
| committer | Even Rouault <even.rouault@spatialys.com> | 2018-12-26 10:08:53 +0100 |
| commit | 610957f7035242f15743c399ffd429b92bc36206 (patch) | |
| tree | 73f0d51147e2f4860c4bfc875f7a4bf9359386d4 /src/projects.h | |
| parent | 355d681ed88019e97742344bd642c2fd97e700a1 (diff) | |
| download | PROJ-610957f7035242f15743c399ffd429b92bc36206.tar.gz PROJ-610957f7035242f15743c399ffd429b92bc36206.zip | |
cpp conversion: minimal steps to fix compilation errors, not warnings
Diffstat (limited to 'src/projects.h')
| -rw-r--r-- | src/projects.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/projects.h b/src/projects.h index 11467d56..ac1a2152 100644 --- a/src/projects.h +++ b/src/projects.h @@ -197,7 +197,6 @@ struct PJconsts; union PJ_COORD; struct geod_geodesic; -struct pj_opaque; struct ARG_list; struct PJ_REGION_S; typedef struct PJ_REGION_S PJ_Region; @@ -260,7 +259,7 @@ PJ_OPERATOR: *****************************************************************************/ typedef PJ *(* PJ_CONSTRUCTOR) (PJ *); -typedef void *(* PJ_DESTRUCTOR) (PJ *, int); +typedef PJ *(* PJ_DESTRUCTOR) (PJ *, int); typedef PJ_COORD (* PJ_OPERATOR) (PJ_COORD, PJ *); /****************************************************************************/ @@ -290,7 +289,7 @@ struct PJconsts { char *def_ellps; struct geod_geodesic *geod; /* For geodesic computations */ - struct pj_opaque *opaque; /* Projection specific parameters, Defined in PJ_*.c */ + void *opaque; /* Projection specific parameters, Defined in PJ_*.c */ int inverted; /* Tell high level API functions to swap inv/fwd */ @@ -828,7 +827,7 @@ extern char const PROJ_DLL pj_release[]; struct PJ_DATUMS PROJ_DLL *pj_get_datums_ref( void ); -void *pj_default_destructor (PJ *P, int errlev); +PJ *pj_default_destructor (PJ *P, int errlev); double PROJ_DLL pj_atof( const char* nptr ); double pj_strtod( const char *nptr, char **endptr ); |