X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Frrd_tool.h;h=954dac8989cafef26b4c7ec58dbfd18cb478e6f2;hb=12ba1178e73143925adc7d376814a44247c6f554;hp=937fe440ea6e8a5367544e960c164adef08af1ad;hpb=ab384eb6dac85f5f57dabcfc16114fcaf79d5e94;p=rrdtool.git diff --git a/src/rrd_tool.h b/src/rrd_tool.h index 937fe44..954dac8 100644 --- a/src/rrd_tool.h +++ b/src/rrd_tool.h @@ -1,5 +1,5 @@ /***************************************************************************** - * RRDtool 1.2.1 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__) -#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 @@ -95,14 +93,13 @@ extern int getrusage(int, struct rusage *); #include "rrd.h" -#if defined(WIN32) && !defined(__CYGWIN__) && !defined(__CYGWIN32__) +#if defined(_WIN32) && !defined(__CYGWIN__) && !defined(__CYGWIN32__) /* Win32 only includes */ #include /* for _isnan */ -#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); @@ -118,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 @@ -152,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);