aboutsummaryrefslogtreecommitdiff
path: root/src/proj_math.h
diff options
context:
space:
mode:
authorKristian Evers <kristianevers@gmail.com>2018-05-23 13:14:48 +0200
committerKristian Evers <kristianevers@gmail.com>2018-05-23 13:41:08 +0200
commitf5c8188faa44ba8dbae533c295d6ae013422f3b9 (patch)
treee98d10ce0ea6dafb2caf101a1eadc8fd67c8952b /src/proj_math.h
parent58cbb9fe4f89b9febd780f7bdcfa4c2bb74a723e (diff)
parent37ebb8f9f0cc5083d22f84433fb2de0fdde8be00 (diff)
downloadPROJ-f5c8188faa44ba8dbae533c295d6ae013422f3b9.tar.gz
PROJ-f5c8188faa44ba8dbae533c295d6ae013422f3b9.zip
Merge branch 'master' into return-nans-quickly
Diffstat (limited to 'src/proj_math.h')
-rw-r--r--src/proj_math.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/proj_math.h b/src/proj_math.h
index ca3ab401..f6dd7e09 100644
--- a/src/proj_math.h
+++ b/src/proj_math.h
@@ -58,10 +58,13 @@ int pj_isnan(double x);
#define round pj_round
#define lround pj_lround
-#ifndef isnan
-#define isnan pj_isnan
+
+#ifdef isnan
+#undef isnan
#endif
+#define isnan pj_isnan
+
#endif /* !(defined(HAVE_C99_MATH) && HAVE_C99_MATH) */
#ifdef __cplusplus