projects
/
rrdtool.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
prepare for the release of rrdtool-1.2.21
[rrdtool.git]
/
src
/
rrd_tool.h
diff --git
a/src/rrd_tool.h
b/src/rrd_tool.h
index
067a653
..
09cda43
100644
(file)
--- a/
src/rrd_tool.h
+++ b/
src/rrd_tool.h
@@
-1,5
+1,5
@@
/*****************************************************************************
/*****************************************************************************
- * RRDtool 1.2.
17 Copyright by Tobi Oetiker, 1997-2006
+ * RRDtool 1.2.
21 Copyright by Tobi Oetiker, 1997-2007
*****************************************************************************
* rrd_tool.h Common Header File
*****************************************************************************/
*****************************************************************************
* rrd_tool.h Common Header File
*****************************************************************************/
@@
-11,12
+11,10
@@
extern "C" {
#ifndef _RRD_TOOL_H
#define _RRD_TOOL_H
#ifndef _RRD_TOOL_H
#define _RRD_TOOL_H
-#if defined(_WIN32) && !defined(__CYGWIN__) && !defined(__CYGWIN32__) && !defined(HAVE_CONFIG_H)
-#include "../win32/config.h"
-#else
#ifdef HAVE_CONFIG_H
#include "../rrd_config.h"
#ifdef HAVE_CONFIG_H
#include "../rrd_config.h"
-#endif
+#elif defined(_WIN32) && !defined(__CYGWIN__) && !defined(__CYGWIN32__)
+#include "../win32/config.h"
#endif
#ifdef MUST_DISABLE_SIGFPE
#endif
#ifdef MUST_DISABLE_SIGFPE
@@
-117,7
+115,7
@@
int isnan(double value);
#endif
/* local include files -- need to be after the system ones */
#endif
/* local include files -- need to be after the system ones */
-#include "getopt.h"
+#include "
rrd_
getopt.h"
#include "rrd_format.h"
#ifndef max
#include "rrd_format.h"
#ifndef max
@@
-161,8
+159,8
@@
info_t *info_push(info_t *, char *, enum info_type, infoval);
int PngSize(FILE *, long *, long *);
int PngSize(FILE *, long *, long *);
-int rrd_create_fn(char *file_name, rrd_t *rrd);
-int rrd_fetch_fn(char *filename, enum cf_en cf_idx,
+int rrd_create_fn(c
onst c
har *file_name, rrd_t *rrd);
+int rrd_fetch_fn(c
onst c
har *filename, enum cf_en cf_idx,
time_t *start,time_t *end,
unsigned long *step,
unsigned long *ds_cnt,
time_t *start,time_t *end,
unsigned long *step,
unsigned long *ds_cnt,
@@
-179,7
+177,7
@@
int readfile(const char *file, char **buffer, int skipfirst);
#define RRD_READONLY 0
#define RRD_READWRITE 1
#define RRD_READONLY 0
#define RRD_READWRITE 1
-enum cf_en cf_conv(char *string);
+enum cf_en cf_conv(c
onst c
har *string);
enum dst_en dst_conv(char *string);
long ds_match(rrd_t *rrd,char *ds_nam);
double rrd_diff(char *a, char *b);
enum dst_en dst_conv(char *string);
long ds_match(rrd_t *rrd,char *ds_nam);
double rrd_diff(char *a, char *b);