diff options
| author | Kristian Evers <kristianevers@gmail.com> | 2018-02-09 13:43:22 +0100 |
|---|---|---|
| committer | Kristian Evers <kristianevers@gmail.com> | 2018-02-09 13:43:22 +0100 |
| commit | 9c75d794177276189d0a2809bc462291e1a070d3 (patch) | |
| tree | 503732fdd531b219e255be37cd32793f7efddfb3 /src/proj_internal.h | |
| parent | 47758e367f8414019365173691e6456411ee8a57 (diff) | |
| download | PROJ-9c75d794177276189d0a2809bc462291e1a070d3.tar.gz PROJ-9c75d794177276189d0a2809bc462291e1a070d3.zip | |
Avoid XY, LP and UV datatype clashes with other libraries.
Remove unnecessary definitions of UV and UVW from project.h that collides with
external libraries. To prevent similar problems in the future the
datatypes XY, LP, UV, XYZ, LPZ and UVW has been prefixed by PJ_ in
proj.h and proj_internal.h
Diffstat (limited to 'src/proj_internal.h')
| -rw-r--r-- | src/proj_internal.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/proj_internal.h b/src/proj_internal.h index bc3b2dd1..071510c7 100644 --- a/src/proj_internal.h +++ b/src/proj_internal.h @@ -91,9 +91,9 @@ PJ_COORD pj_approx_3D_trans (PJ *P, PJ_DIRECTION direction, PJ_COORD coo); /* Grid functionality */ int proj_vgrid_init(PJ *P, const char *grids); int proj_hgrid_init(PJ *P, const char *grids); -double proj_vgrid_value(PJ *P, LP lp); -LP proj_hgrid_value(PJ *P, LP lp); -LP proj_hgrid_apply(PJ *P, LP lp, PJ_DIRECTION direction); +double proj_vgrid_value(PJ *P, PJ_LP lp); +PJ_LP proj_hgrid_value(PJ *P, PJ_LP lp); +PJ_LP proj_hgrid_apply(PJ *P, PJ_LP lp, PJ_DIRECTION direction); /* High level functionality for handling thread contexts */ enum proj_log_level { |