/*****************************************************************************
- * RRDtool 1.0.33 Copyright Tobias Oetiker, 1997 - 2000
+ * RRDtool 1.2.15 Copyright by Tobi Oetiker, 1997-2006
*****************************************************************************
* rrd_tool.h Common Header File
*****************************************************************************/
#ifndef _RRD_TOOL_H
#define _RRD_TOOL_H
-#ifdef WIN32
-#include "../confignt/config.h"
+#if defined(_WIN32) && !defined(__CYGWIN__) && !defined(__CYGWIN32__) && !defined(HAVE_CONFIG_H)
+#include "../win32/config.h"
#else
#ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "../rrd_config.h"
#endif
#endif
#include "rrd.h"
-#ifndef WIN32
+#if defined(_WIN32) && !defined(__CYGWIN__) && !defined(__CYGWIN32__)
+
+/* Win32 only includes */
+
+#include <float.h> /* for _isnan */
+#include <io.h> /* for chdir */
+
+struct tm* localtime_r(const time_t *timep, struct tm* result);
+char* ctime_r(const time_t *timep, char* result);
+struct tm* gmtime_r(const time_t *timep, struct tm* result);
+char *strtok_r(char *str, const char *sep, char **last);
+
+#else
/* unix-only includes */
#ifndef isnan
int isnan(double value);
#endif
-#else
-
-/* Win32 only includes */
-
-#include <float.h> /* for _isnan */
-#define isnan _isnan
-#define finite _finite
-#define isinf(a) (_fpclass(a) == _FPCLASS_NINF || _fpclass(a) == _FPCLASS_PINF)
#endif
/* local include files -- need to be after the system ones */
/* rrd info interface */
enum info_type { RD_I_VAL=0,
RD_I_CNT,
- RD_I_STR };
+ RD_I_STR,
+ RD_I_INT };
typedef union infoval {
unsigned long u_cnt;
rrd_value_t u_val;
char *u_str;
+ int u_int;
} infoval;
typedef struct info_t {
struct info_t *next;
} info_t;
-
info_t *rrd_info(int, char **);
+info_t *rrd_update_v(int, char **);
+char * sprintf_alloc(char *, ...);
+info_t *info_push(info_t *, char *, enum info_type, infoval);
/* HELPER FUNCTIONS */
void rrd_freemem(void *mem);
void rrd_init(rrd_t *rrd);
-int rrd_open(char *file_name, FILE **in_file, rrd_t *rrd, int rdwr);
-int rrd_open_r(char *file_name, FILE **in_file, rrd_t *rrd, int rdwr);
-int readfile(char *file, char **buffer, int skipfirst);
-int readfile_r(char *file, char **buffer, int skipfirst);
+int rrd_open(const char *file_name, FILE **in_file, rrd_t *rrd, int rdwr);
+int readfile(const char *file, char **buffer, int skipfirst);
#define RRD_READONLY 0
#define RRD_READWRITE 1
thread overwrite the same buffer */
const char *rrd_strerror(int err);
-/* just a defensive work-around... */
-#define strerror(x) rrd_strerror(x)
-
#endif
#ifdef __cplusplus