diff options
| author | Kristian Evers <kristianevers@gmail.com> | 2018-02-11 01:12:23 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-11 01:12:23 +0100 |
| commit | 39789cb3eaeebc2194934cd9f3084422239cb028 (patch) | |
| tree | 6c4f4fe1f6a0f029417129b46090675d5660edba | |
| parent | e1a213b2d9a29d86b89547781a2e27d5fd01f111 (diff) | |
| parent | 06d35126d36f377e06da0a747cf0847e1827d1be (diff) | |
| download | PROJ-39789cb3eaeebc2194934cd9f3084422239cb028.tar.gz PROJ-39789cb3eaeebc2194934cd9f3084422239cb028.zip | |
Merge pull request #790 from kbevers/fix-proj_api.h
Fix proj.h + proj_api.h inclusion errors
| -rw-r--r-- | src/proj_api.h | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/proj_api.h b/src/proj_api.h index 40c40ad1..5bba5887 100644 --- a/src/proj_api.h +++ b/src/proj_api.h @@ -25,8 +25,6 @@ * DEALINGS IN THE SOFTWARE. *****************************************************************************/ - - /* * This version number should be updated with every release! * @@ -84,10 +82,18 @@ 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 */ -# define projXY XY +#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 */ typedef struct { double u, v; } projUV; |