From 607a0116ce790f34c2ddb6c83990b21068bf7c6e Mon Sep 17 00:00:00 2001
From: Charles Karney <charles@karney.com>
Date: Fri, 23 Mar 2018 06:29:23 -0400
Subject: Undo mistaken push to master.

---
 CMakeLists.txt      | 3 +--
 configure.ac        | 3 +--
 src/pj_internal.c   | 4 ----
 src/proj_internal.h | 8 --------
 4 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e6f56788..02de6a81 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -100,8 +100,7 @@ int main() {
   int q;
   return (int)(hypot(3.0, 4.0) + atanh(0.8) + cbrt(8.0) +
                remquo(100.0, 90.0, &q) +
-               remainder(100.0, 90.0) + copysign(1.0, -0.0)) +
-               isnan(0.0);
+               remainder(100.0, 90.0) + copysign(1.0, -0.0));
 }\n" C99_MATH)
 if (C99_MATH)
   add_definitions (-DHAVE_C99_MATH=1)
diff --git a/configure.ac b/configure.ac
index 99a764db..66da9d13 100644
--- a/configure.ac
+++ b/configure.ac
@@ -44,8 +44,7 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM(
         [int q;
          return (int)(hypot(3.0, 4.0) + atanh(0.8) + cbrt(8.0) +
                       remquo(100.0, 90.0, &q) +
-                      remainder(100.0, 90.0) + copysign(1.0, -0.0)) +
-		      isnan(0.0);])],
+                      remainder(100.0, 90.0) + copysign(1.0, -0.0));])],
         [AC_MSG_RESULT([yes]);C99_MATH="-DHAVE_C99_MATH=1"],
         [AC_MSG_RESULT([no]);C99_MATH="-DHAVE_C99_MATH=0"])
 CFLAGS="$save_CFLAGS $C99_MATH"
diff --git a/src/pj_internal.c b/src/pj_internal.c
index 4da47051..9cbbf20a 100644
--- a/src/pj_internal.c
+++ b/src/pj_internal.c
@@ -445,9 +445,6 @@ void proj_log_func (PJ_CONTEXT *ctx, void *app_data, PJ_LOG_FUNCTION logf) {
 }
 
 
-#if HAVE_C99_MATH
-/* proj_internal.h defines pj_is_nan as isnan */
-#else
 /*****************************************************************************/
 int pj_is_nan (double val) {
 /******************************************************************************
@@ -458,4 +455,3 @@ int pj_is_nan (double val) {
     /* cppcheck-suppress duplicateExpression */
     return val != val;
 }
-#endif
diff --git a/src/proj_internal.h b/src/proj_internal.h
index 3f6ccde0..b3843a59 100644
--- a/src/proj_internal.h
+++ b/src/proj_internal.h
@@ -50,10 +50,6 @@ extern "C" {
 
 #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
@@ -134,11 +130,7 @@ void proj_fileapi_set (PJ *P, void *fileapi);
 const char * const *proj_get_searchpath(void);
 int    proj_get_path_count(void);
 
-#if HAVE_C99_MATH
-#define pj_is_nan isnan
-#else
 int pj_is_nan (double val);
-#endif
 
 #ifdef __cplusplus
 }
-- 
cgit v1.2.3