X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Frrd_tool.h;h=954dac8989cafef26b4c7ec58dbfd18cb478e6f2;hb=9becc239839e47acb1ca494365931cfb750f927c;hp=350d23eee0cfd84c78741b5778513bb0ad7bc09a;hpb=0881b8848ab8c1cb9b50db4599d4adc9391a774d;p=rrdtool.git diff --git a/src/rrd_tool.h b/src/rrd_tool.h index 350d23e..954dac8 100644 --- a/src/rrd_tool.h +++ b/src/rrd_tool.h @@ -1,5 +1,5 @@ /***************************************************************************** - * RRDtool 1.2.12 Copyright by Tobi Oetiker, 1997-2005 + * RRDtool 1.2.19 Copyright by Tobi Oetiker, 1997-2007 ***************************************************************************** * rrd_tool.h Common Header File *****************************************************************************/ @@ -11,12 +11,10 @@ extern "C" { #ifndef _RRD_TOOL_H #define _RRD_TOOL_H -#if defined(_WIN32) && !defined(__CYGWIN__) && !defined(__CYGWIN32__) && !defined(HAVE_CONFIG_H) -#include "../confignt/config.h" -#else #ifdef HAVE_CONFIG_H -#include -#endif +#include "../rrd_config.h" +#elif defined(_WIN32) && !defined(__CYGWIN__) && !defined(__CYGWIN32__) +#include "../win32/config.h" #endif #ifdef MUST_DISABLE_SIGFPE @@ -100,20 +98,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 @@ -125,7 +115,7 @@ int isnan(double value); #endif /* local include files -- need to be after the system ones */ -#include "getopt.h" +#include "rrd_getopt.h" #include "rrd_format.h" #ifndef max @@ -159,6 +149,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);