Imported upstream version 1.4.8

[pkg-rrdtool.git] / src / rrd_tool.h

diff --git a/src/rrd_tool.h b/src/rrd_tool.h
index ef327586bddc81cf4b3073198731e57895fbe7a8..0d3a3007f55dc69791bbda297aa7f9e0c303af97 100644 (file)
--- a/src/rrd_tool.h
+++ b/src/rrd_tool.h
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * RRDtool 1.4.2  Copyright by Tobi Oetiker, 1997-2009
+ * RRDtool 1.4.8  Copyright by Tobi Oetiker, 1997-2013
  *****************************************************************************
  * rrd_tool.h   Common Header File
  *****************************************************************************/
@@ -10,10 +10,12 @@ extern    "C" {
 #ifndef _RRD_TOOL_H
 #define _RRD_TOOL_H
 
+#if defined(WIN32) && !defined(__CYGWIN__) && !defined(__CYGWIN32__)
+#include "../win32/config.h"
+#else
 #ifdef HAVE_CONFIG_H
 #include "../rrd_config.h"
-#elif defined(_WIN32) && !defined(__CYGWIN__) && !defined(__CYGWIN32__)
-#include "../win32/config.h"
+#endif
 #endif
 
 #include "rrd.h"
@@ -42,7 +44,7 @@ extern    "C" {
 #else
 
 /* unix-only includes */
-#if !defined isnan && !defined HAVE_ISNAN
+#if !defined(isnan) && !defined(HAVE_ISNAN)
     int       isnan(
     double value);
 #endif
@@ -107,6 +109,7 @@ int rrd_fetch_fn_libdbi(const char *filename, enum cf_en cf_idx,
 #define RRD_CREAT       (1<<2)
 #define RRD_READAHEAD   (1<<3)
 #define RRD_COPY        (1<<4)
+#define RRD_EXCL        (1<<5)
 
     enum cf_en cf_conv(
     const char *string);