integrate rrd_nan_inf header

git-svn-id: svn://svn.oetiker.ch/rrdtool/trunk@1227 a5681a0c-68f1-0310-ab6d-d61299d08faa

diff --git a/program/src/Makefile.am b/program/src/Makefile.am
index 0a5b0e211c9cd29bc82bc5c543d5773e1be86d08..73a312de5a7c807d86f181af36519052317d74b4 100644 (file)
--- a/program/src/Makefile.am
+++ b/program/src/Makefile.am
@@ -52,7 +52,7 @@ noinst_HEADERS = \
        rrd_getopt.h parsetime.h \
        rrd_format.h rrd_tool.h rrd_xport.h rrd.h rrd_rpncalc.h \
        rrd_hw.h rrd_hw_math.h rrd_hw_update.h \
-       rrd_nan_inf.h fnv.h rrd_graph.h \
+       fnv.h rrd_graph.h \
        rrd_is_thread_safe.h
 
 noinst_LTLIBRARIES        = librrdupd.la

diff --git a/program/src/rrd.h b/program/src/rrd.h
index e53751d3f83972f723112ddc5898783734dc589e..3030788e6451dc78dbf65a6cf0e9d6f78bf030c6 100644 (file)
--- a/program/src/rrd.h
+++ b/program/src/rrd.h
@@ -57,6 +57,19 @@ extern    "C" {
 #include <time.h>
 #include <stdio.h>      /* for FILE */
 
+
+/* Formerly rrd_nan_inf.h */
+#ifndef DNAN
+# define DNAN set_to_DNAN()
+#endif
+
+#ifndef DINF
+# define DINF set_to_DINF()
+#endif
+double set_to_DNAN(void);
+double set_to_DINF(void);
+/* end of rrd_nan_inf.h */
+
 /* Transplanted from rrd_format.h */
     typedef double rrd_value_t; /* the data storage type is
                                  * double */

diff --git a/program/src/rrd_nan_inf.h b/program/src/rrd_nan_inf.h
deleted file mode 100644 (file)
index bc37c48..0000000
--- a/program/src/rrd_nan_inf.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#define DNAN          set_to_DNAN()
-#define DINF          set_to_DINF()
-
-double    set_to_DNAN(
-    void);
-double    set_to_DINF(
-    void);