X-Git-Url: https://git.octo.it/?p=rrdtool.git;a=blobdiff_plain;f=src%2Frrd_tool.h;h=40a484601e021f78b3b3af7f081dc82968e105e6;hp=c1c9728436a327ea5f4d924eb207f4fbb9a7c359;hb=ed3ee7c81e23fcd41693bc372470945576ae54d1;hpb=1d0d1678df2083bc996d579e0c5d0cc46fff6745 diff --git a/src/rrd_tool.h b/src/rrd_tool.h index c1c9728..40a4846 100644 --- a/src/rrd_tool.h +++ b/src/rrd_tool.h @@ -1,5 +1,5 @@ /***************************************************************************** - * RRDtool 1.3.2 Copyright by Tobi Oetiker, 1997-2008 + * RRDtool 1.4.3 Copyright by Tobi Oetiker, 1997-2010 ***************************************************************************** * 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" @@ -82,7 +84,8 @@ extern "C" { int rrd_create_fn( const char *file_name, - rrd_t *rrd); + rrd_t *rrd, + int no_overwrite); int rrd_fetch_fn (const char *filename, enum cf_en cf_idx, time_t *start, @@ -94,7 +97,7 @@ extern "C" { #ifdef HAVE_LIBDBI -int rrd_fetch_fn_libdbi(char *filename, enum cf_en cf_idx, +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, @@ -107,6 +110,7 @@ int rrd_fetch_fn_libdbi(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); @@ -121,6 +125,8 @@ int rrd_fetch_fn_libdbi(char *filename, enum cf_en cf_idx, char *a, char *b); + const char *cf_to_string (enum cf_en cf); + #endif /* _RRD_TOOL_H */ #ifdef __cplusplus