diff --git a/src/rrd_tool.h b/src/rrd_tool.h
index 86787777e0bbff4ff0bbe419901320b56e8cfe3b..0d3a3007f55dc69791bbda297aa7f9e0c303af97 100644 (file)
--- a/src/rrd_tool.h
+++ b/src/rrd_tool.h
/*****************************************************************************
/*****************************************************************************
- * RRDtool 1.3.7 Copyright by Tobi Oetiker, 1997-2009
+ * RRDtool 1.4.8 Copyright by Tobi Oetiker, 1997-2013
*****************************************************************************
* rrd_tool.h Common Header File
*****************************************************************************/
*****************************************************************************
* rrd_tool.h Common Header File
*****************************************************************************/
#ifndef _RRD_TOOL_H
#define _RRD_TOOL_H
#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"
#ifdef HAVE_CONFIG_H
#include "../rrd_config.h"
-#elif defined(_WIN32) && !defined(__CYGWIN__) && !defined(__CYGWIN32__)
-#include "../win32/config.h"
+#endif
#endif
#include "rrd.h"
#endif
#include "rrd.h"
#else
/* unix-only includes */
#else
/* unix-only includes */
-#if !defined isnan && !defined HAVE_ISNAN
+#if !defined(isnan) && !defined(HAVE_ISNAN)
int isnan(
double value);
#endif
int isnan(
double value);
#endif
int rrd_create_fn(
const char *file_name,
rrd_t *rrd);
int rrd_create_fn(
const char *file_name,
rrd_t *rrd);
- int rrd_fetch_fn(
- const char *filename,
- enum cf_en cf_idx,
- time_t *start,
- time_t *end,
- unsigned long *step,
- unsigned long *ds_cnt,
- char ***ds_namv,
- rrd_value_t **data);
+ int rrd_fetch_fn (const char *filename,
+ enum cf_en cf_idx,
+ time_t *start,
+ time_t *end,
+ unsigned long *step,
+ unsigned long *ds_cnt,
+ char ***ds_namv,
+ rrd_value_t **data);
+
+
+#ifdef HAVE_LIBDBI
+int rrd_fetch_fn_libdbi(const char *filename, enum cf_en cf_idx,
+ time_t *start,time_t *end,
+ unsigned long *step,
+ unsigned long *ds_cnt,
+ char ***ds_namv,
+ rrd_value_t **data);
+#endif
#define RRD_READONLY (1<<0)
#define RRD_READWRITE (1<<1)
#define RRD_CREAT (1<<2)
#define RRD_READAHEAD (1<<3)
#define RRD_COPY (1<<4)
#define RRD_READONLY (1<<0)
#define RRD_READWRITE (1<<1)
#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);
enum cf_en cf_conv(
const char *string);
long ds_match(
rrd_t *rrd,
char *ds_nam);
long ds_match(
rrd_t *rrd,
char *ds_nam);
+ off_t rrd_get_header_size(
+ rrd_t *rrd);
double rrd_diff(
char *a,
char *b);
double rrd_diff(
char *a,
char *b);
-#endif
+#endif /* _RRD_TOOL_H */
#ifdef __cplusplus
}
#ifdef __cplusplus
}