diff options
| author | Kristian Evers <kristianevers@gmail.com> | 2018-02-10 23:25:36 +0100 |
|---|---|---|
| committer | Kristian Evers <kristianevers@gmail.com> | 2018-02-11 00:10:56 +0100 |
| commit | 06d35126d36f377e06da0a747cf0847e1827d1be (patch) | |
| tree | d53a2cc7cc54353362f7a7175e581fcf6a5e1782 /src/proj_api.h | |
| parent | 2cca9ead11be47f6efd0ab504cf2e9020b85fa80 (diff) | |
| download | PROJ-06d35126d36f377e06da0a747cf0847e1827d1be.tar.gz PROJ-06d35126d36f377e06da0a747cf0847e1827d1be.zip | |
Make sure that #define's work properly when including proj_api.h and proj.h together.
Diffstat (limited to 'src/proj_api.h')
| -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; |