From: Tobias Oetiker <tobi@oetiker.ch>
Date: Fri, 15 May 2015 03:54:18 +0000 (-0400)
Subject: makeing patch compile again
X-Git-Tag: v1.5.4~39^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F618%2Fhead;p=thirdparty%2Frrdtool-1.x.git

makeing patch compile again
---

diff --git a/src/rrd_create.c b/src/rrd_create.c
index 04033fb7..32c9bd65 100644
--- a/src/rrd_create.c
+++ b/src/rrd_create.c
@@ -2304,7 +2304,8 @@ static int cdp_match(const rra_def_t *tofill, const rra_def_t *maybe) {
 static int rrd_prefill_data(rrd_t *rrd, const GList *sources, mapping_t *mappings, int mappings_cnt) {
     int rc = -1;
     long cdp_rra_index = -1;
-    
+    int rra_added_temporarily = 0;
+     
     if (sources == NULL) {
         // we are done if there is nothing to copy data from
         rc = 0;
@@ -2314,7 +2315,6 @@ static int rrd_prefill_data(rrd_t *rrd, const GList *sources, mapping_t *mapping
     unsigned long rra_index, ds_index;
     unsigned long total_rows = 0;
     
-    int rra_added_temporarily = 0;
     cdp_rra_index = rra_for_cdp_prefilling(rrd, &rra_added_temporarily);
 
     if (rrd_test_error()) goto done;
diff --git a/src/rrd_diff.c b/src/rrd_diff.c
index cc64eb96..93769508 100644
--- a/src/rrd_diff.c
+++ b/src/rrd_diff.c
@@ -8,7 +8,7 @@
 
 #include <ctype.h>
 #include "rrd_tool.h"
-#include "rrd_strtodbl.h"
+#include "rrd_strtod.h"
 
 double rrd_diff(
     char *a,