fix border condition in rra selection of rrd_fetch

[rrdtool.git] / src / rrd_tool.h

diff --git a/src/rrd_tool.h b/src/rrd_tool.h
index 789f072..f21a17a 100644 (file)
--- a/src/rrd_tool.h
+++ b/src/rrd_tool.h
@@ -2,12 +2,6 @@
  * RRDtool 1.0.33  Copyright Tobias Oetiker, 1997 - 2000
  *****************************************************************************
  * rrd_tool.h   Common Header File
- *****************************************************************************
- * $Id$
- * $Log$
- * Revision 1.1  2001/02/25 22:25:06  oetiker
- * Initial revision
- *
  *****************************************************************************/
 #ifdef  __cplusplus
 extern "C" {
@@ -18,7 +12,7 @@ extern "C" {
 #define _RRD_TOOL_H
 
 #ifdef WIN32
-# include "ntconfig.h"
+#include "../confignt/config.h"
 #else
 #ifdef HAVE_CONFIG_H
 #include <config.h>
@@ -51,6 +45,36 @@ extern "C" {
 #if HAVE_MATH_H
 # include <math.h>
 #endif
+/* Sorry: don't know autoconf as well how to check the exist of
+   dirent.h ans sys/stat.h
+*/
+
+#if HAVE_DIRENT_H
+# include <dirent.h>
+# define NAMLEN(dirent) strlen((dirent)->d_name)
+#else
+# define dirent direct
+# define NAMLEN(dirent) (dirent)->d_namlen
+# if HAVE_SYS_NDIR_H
+#  include <sys/ndir.h>
+# endif
+# if HAVE_SYS_DIR_H
+#  include <sys/dir.h>
+# endif
+# if HAVE_NDIR_H
+#  include <ndir.h>
+# endif
+#endif
+
+#if HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+
+#if HAVE_SYS_STAT_H
+# include <sys/stat.h>
+#endif
+
+
 #if HAVE_UNISTD_H
 # include <unistd.h>
 #endif
@@ -124,12 +148,8 @@ typedef struct info_t {
 info_t *rrd_info(int, char **);
 
 /* HELPER FUNCTIONS */
-int GifSize(FILE *, long *, long *);
-int PngSize(FILE *, long *, long *);
-int PngSize(FILE *, long *, long *);
 
-#include <gd.h>
-void gdImagePng(gdImagePtr im, FILE *out);
+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,
@@ -140,6 +160,7 @@ int rrd_fetch_fn(char *filename, enum cf_en cf_idx,
                 rrd_value_t **data);
 
 void rrd_free(rrd_t *rrd);
+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);
@@ -155,9 +176,6 @@ double rrd_diff(char *a, char *b);
 
 #endif
 
-
 #ifdef  __cplusplus
 }
 #endif
-
-