X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Frrd_tool.h;h=067a65319955829984a73ba81bc6a8108e17839a;hb=734468bcc23497c7eba0deba87c92aa219fd46d1;hp=e1a79615fc2676aa5c8eb76c094e77a0a0ca7002;hpb=22ecdee73cbb51ac7c3301ce39749f819ea72d0e;p=rrdtool.git diff --git a/src/rrd_tool.h b/src/rrd_tool.h index e1a7961..067a653 100644 --- a/src/rrd_tool.h +++ b/src/rrd_tool.h @@ -1,5 +1,5 @@ /***************************************************************************** - * RRDtool 1.2.11 Copyright by Tobi Oetiker, 1997-2005 + * RRDtool 1.2.17 Copyright by Tobi Oetiker, 1997-2006 ***************************************************************************** * rrd_tool.h Common Header File *****************************************************************************/ @@ -12,10 +12,10 @@ extern "C" { #define _RRD_TOOL_H #if defined(_WIN32) && !defined(__CYGWIN__) && !defined(__CYGWIN32__) && !defined(HAVE_CONFIG_H) -#include "../confignt/config.h" +#include "../win32/config.h" #else #ifdef HAVE_CONFIG_H -#include +#include "../rrd_config.h" #endif #endif @@ -100,20 +100,12 @@ extern int getrusage(int, struct rusage *); /* Win32 only includes */ #include /* for _isnan */ -#ifdef __MINGW32__ -#define localtime_r(a,b) localtime(a) -#define ctime_r(a,b) ctime(a) -#define gmtime_r(a,b) gmtime(a) -#define strtok_r(a,b,c) strtok(a,b) -#else -#define isnan _isnan -#define finite _finite -#define isinf(a) (_fpclass(a) == _FPCLASS_NINF || _fpclass(a) == _FPCLASS_PINF) +#include /* 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); -#endif #else @@ -159,6 +151,8 @@ typedef struct info_t { } info_t; info_t *rrd_info(int, char **); +int rrd_lastupdate(int argc, char **argv, time_t *last_update, + unsigned long *ds_cnt, char ***ds_namv, char ***last_ds); info_t *rrd_update_v(int, char **); char * sprintf_alloc(char *, ...); info_t *info_push(info_t *, char *, enum info_type, infoval);