Merge branch 'pull/collectd-4' into collectd-4

diff --git a/configure.in b/configure.in
index 3636675..5166ad1 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -453,6 +453,9 @@ if test "x$nan_type" = "xnone"; then
       [[
 #include <stdlib.h>
 #include <math.h>
+#ifdef NAN
+# undef NAN
+#endif
 #define NAN (0.0 / 0.0)
 #ifndef isnan
 # define isnan(f) ((f) != (f))

diff --git a/src/collectd.h b/src/collectd.h
index e1ce97c..3d44c51 100644 (file)
--- a/src/collectd.h
+++ b/src/collectd.h
@@ -113,6 +113,9 @@
 /* #endif NAN_STATIC_ISOC */
 #elif NAN_ZERO_ZERO
 # include <math.h>
+# ifdef NAN
+#  undef NAN
+# endif
 # define NAN (0.0 / 0.0)
 # ifndef isnan
 #  define isnan(f) ((f) != (f))