diff options
| author | Kristian Evers <kristianevers@gmail.com> | 2017-12-06 08:14:25 +0100 |
|---|---|---|
| committer | Kristian Evers <kristianevers@gmail.com> | 2017-12-06 08:14:25 +0100 |
| commit | 43ba4112a8901278387d0c3815937f4cbb0c5b0c (patch) | |
| tree | 6ed1c9820927b990170ccb53dcc9ed684a9393e4 /src/projects.h | |
| parent | 597a208400377ca6285fbd204c44817e21f31907 (diff) | |
| parent | 86b96ccb8c926f831451c3e6d364319a0d833522 (diff) | |
| download | PROJ-43ba4112a8901278387d0c3815937f4cbb0c5b0c.tar.gz PROJ-43ba4112a8901278387d0c3815937f4cbb0c5b0c.zip | |
Merge remote-tracking branch 'osgeo/master' into docs-release-4.10.0
Diffstat (limited to 'src/projects.h')
| -rw-r--r-- | src/projects.h | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/projects.h b/src/projects.h index 99df0e3e..8c0f81fa 100644 --- a/src/projects.h +++ b/src/projects.h @@ -43,6 +43,7 @@ #endif /* standard inclusions */ +#include <limits.h> #include <math.h> #include <stdio.h> #include <stdlib.h> @@ -78,6 +79,14 @@ extern "C" { # define ABS(x) ((x<0) ? (-1*(x)) : x) #endif +#if INT_MAX == 2147483647 +typedef int pj_int32; +#elif LONG_MAX == 2147483647 +typedef long pj_int32; +#else +#warning It seems no 32-bit integer type is available +#endif + /* maximum path/filename */ #ifndef MAX_PATH_FILENAME #define MAX_PATH_FILENAME 1024 @@ -618,7 +627,7 @@ PJ *pj_projection_specific_setup_##name (PJ *P) #define MAX_TAB_ID 80 typedef struct { float lam, phi; } FLP; -typedef struct { int lam, phi; } ILP; +typedef struct { pj_int32 lam, phi; } ILP; struct CTABLE { char id[MAX_TAB_ID]; /* ascii info */ |