diff options
| author | Even Rouault <even.rouault@mines-paris.org> | 2018-12-31 11:37:51 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-31 11:37:51 +0100 |
| commit | 32f3ef47e55c38b0eabb6d781fee3944d3239414 (patch) | |
| tree | ba2850500ee732559bada055dbab281ceff49a22 /src/proj_api.h | |
| parent | 5c41d3a1078895ed096b416db15c91108bccad87 (diff) | |
| parent | 0e0e0e475414ddeb75e0e140d8a3381a431036d9 (diff) | |
| download | PROJ-32f3ef47e55c38b0eabb6d781fee3944d3239414.tar.gz PROJ-32f3ef47e55c38b0eabb6d781fee3944d3239414.zip | |
Merge pull request #1208 from rouault/merge_PJ_and_PJ_OBJ
Unify PJ_OBJ and PJ structures
Diffstat (limited to 'src/proj_api.h')
| -rw-r--r-- | src/proj_api.h | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/src/proj_api.h b/src/proj_api.h index a8a7f106..5c4d5e7a 100644 --- a/src/proj_api.h +++ b/src/proj_api.h @@ -82,7 +82,7 @@ extern "C" { #define DEG_TO_RAD .017453292519943296 -#if defined(PROJECTS_H) || defined(PROJ_H) +#if defined(PROJ_H) #define PROJ_API_H_NOT_INVOKED_AS_PRIMARY_API #endif @@ -103,17 +103,10 @@ PROJ_DLL extern int pj_errno; /* global error return code */ /* These make the function declarations below conform with classic proj */ typedef PJ *projPJ; /* projPJ is a pointer to PJ */ typedef struct projCtx_t *projCtx; /* projCtx is a pointer to projCtx_t */ -#ifdef PROJ_H # define projXY PJ_XY # define projLP PJ_LP # define projXYZ PJ_XYZ # define projLPZ PJ_LPZ -#else -# define projXY XY -# define projLP LP -# define projXYZ XYZ -# define projLPZ LPZ -#endif #else /* i.e. proj_api invoked as primary API */ |