Move rrd_database structure under rrdtool.h

Keep all rrdtool related structure definitions under this one header
file.

Signed-off-by: Timo Kokkonen <kaapeli@itanic.dy.fi>

diff --git a/rrdtool.h b/rrdtool.h
index a045db4db5e426a10d696225ae385f6474f57155..4853451cbb5249ae8b9e777c3ff7e4b1df14a48b 100644 (file)
--- a/rrdtool.h
+++ b/rrdtool.h
@@ -16,6 +16,15 @@ struct rrd_image {
        char    **text;         /* Null terminated list of text lines */
 };
 
+struct rrd_database {
+       char    *filename;      /* rrd database location */
+       int     interval;       /* Update interval */
+       int (*parse)(char *data); /* Parser to aquire data */
+       struct  rrd_image **images; /* Images to draw */
+       int     last_update;    /* When was the data last updated */
+       char    *name;          /* Name of the database */
+};
+
 int rrdtool_draw_image(struct rrd_image *image);
 int rrdtool_draw_images(struct rrd_image **image);
 int rrdtool_update_data(struct rrd_database *rrd);

diff --git a/scheduler.h b/scheduler.h
index 92ec2d2048f63c77ac70d381547a43f3274cdec9..50187f0444d21e64f4adc99b4490de2e01aed0ef 100644 (file)
--- a/scheduler.h
+++ b/scheduler.h
@@ -5,15 +5,6 @@
 
 #include "rrdtool.h"
 
-struct rrd_database {
-       char    *filename;      /* rrd database location */
-       int     interval;       /* Update interval */
-       int (*parse)(char *data); /* Parser to aquire data */
-       struct  rrd_image **images; /* Images to draw */
-       int     last_update;    /* When was the data last updated */
-       char    *name;          /* Name of the database */
-};
-
 struct rrd_database *check_update_need(struct rrd_database **dblist);
 int get_next_update(struct rrd_database **dblist);