From 1c2f375033afb0a4eb57c978222db2feeb148f43 Mon Sep 17 00:00:00 2001 From: Charles Karney Date: Thu, 19 Sep 2019 09:25:09 -0400 Subject: Require C99 compiler see #1621 cmake and autoconf now stipulate C99 change c89 to c99 in travis jobs remove HAVE_C99_MATH checks (unrelated) relax Visual Studio compatibility check in cmake/project-config-version.cmake.in (VS 2019 can use a VS 2015 library but not vice versa). --- src/geodesic.c | 5 +++++ src/proj_internal.h | 4 ---- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'src') 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 #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 -- cgit v1.2.3