diff --git a/src/rrd_tool.h b/src/rrd_tool.h
index 7024363c884fad3fbfbdf3181cc0ae723389a191..a874f2637321a3182cf31d681ad7d78b2a309292 100644 (file)
--- a/src/rrd_tool.h
+++ b/src/rrd_tool.h
/*****************************************************************************
- * RRDtool 1.2.18 Copyright by Tobi Oetiker, 1997-2006
+ * RRDtool 1.2.24 Copyright by Tobi Oetiker, 1997-2007
*****************************************************************************
* rrd_tool.h Common Header File
*****************************************************************************/
#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"
-#endif
+#elif defined(_WIN32) && !defined(__CYGWIN__) && !defined(__CYGWIN32__)
+#include "../win32/config.h"
#endif
#ifdef MUST_DISABLE_SIGFPE
#ifdef MUST_DISABLE_FPMASK
#include <floatingpoint.h>
#endif
-
+
#include <stdio.h>
#include <stdlib.h>
#include <errno.h>
#include <string.h>
-#include <time.h>
#include <ctype.h>
#if HAVE_SYS_PARAM_H
# include <sys/stat.h>
#endif
-
#if HAVE_UNISTD_H
# include <unistd.h>
#endif
-#if HAVE_SYS_TIME_H
+
+#if TIME_WITH_SYS_TIME
# include <sys/time.h>
+# include <time.h>
+#else
+# if HAVE_SYS_TIME_H
+# include <sys/time.h>
+# else
+# include <time.h>
+# endif
#endif
+
#if HAVE_SYS_TIMES_H
# include <sys/times.h>
#endif
+
+
#if HAVE_SYS_RESOURCE_H
# include <sys/resource.h>
#if (defined(__svr4__) && defined(__sun__))
#else
/* unix-only includes */
-#ifndef isnan
+#if !defined isnan && !defined HAVE_ISNAN
int isnan(double value);
#endif
#endif
/* local include files -- need to be after the system ones */
-#include "getopt.h"
+#include "rrd_getopt.h"
#include "rrd_format.h"
#ifndef max
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(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,
#define RRD_READONLY 0
#define RRD_READWRITE 1
-enum cf_en cf_conv(char *string);
+enum cf_en cf_conv(const char *string);
enum dst_en dst_conv(char *string);
long ds_match(rrd_t *rrd,char *ds_nam);
double rrd_diff(char *a, char *b);