diff options
| author | Charles Karney <charles@karney.com> | 2019-09-19 19:55:33 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-19 19:55:33 -0400 |
| commit | af2da10565fa9bc9f05d2e8b4d4a7053209f554e (patch) | |
| tree | 5f1644142a32d3fc47a7a3592860dbe48dea4638 /src | |
| parent | 8948068deaa8b1b9cf14e7e509d06abc3a0b8dcf (diff) | |
| parent | 1c2f375033afb0a4eb57c978222db2feeb148f43 (diff) | |
| download | PROJ-af2da10565fa9bc9f05d2e8b4d4a7053209f554e.tar.gz PROJ-af2da10565fa9bc9f05d2e8b4d4a7053209f554e.zip | |
Merge pull request #1624 from cffk/c99-upgrade
Require C99 compiler see #1621
Diffstat (limited to 'src')
| -rw-r--r-- | src/geodesic.c | 5 | ||||
| -rw-r--r-- | src/proj_internal.h | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/geodesic.c b/src/geodesic.c index 49c9823e..dcdd4d77 100644 --- a/src/geodesic.c +++ b/src/geodesic.c @@ -27,8 +27,13 @@ #include <math.h> #if !defined(HAVE_C99_MATH) +#if defined(PROJ_LIB) +/* PROJ requires C99 so HAVE_C99_MATH is implicit */ +#define HAVE_C99_MATH 1 +#else #define HAVE_C99_MATH 0 #endif +#endif #if !defined(__cplusplus) #define nullptr 0 diff --git a/src/proj_internal.h b/src/proj_internal.h index 4a126e98..6d978b35 100644 --- a/src/proj_internal.h +++ b/src/proj_internal.h @@ -76,10 +76,6 @@ #define STATIC_ASSERT(COND) ((void)sizeof(char[(COND) ? 1 : -1])) -#if !defined(HAVE_C99_MATH) -#define HAVE_C99_MATH 0 -#endif - #ifndef PJ_TODEG #define PJ_TODEG(rad) ((rad)*180.0/M_PI) #endif |