From: Simon Boulet <simon@nostalgeek.com>
Date: Sun, 1 Feb 2015 02:03:53 +0000 (-0500)
Subject: Use of keyword "template" prevents including header file in C++
X-Git-Tag: v1.5.0-rc2~6^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F584%2Fhead;p=thirdparty%2Frrdtool-1.x.git

Use of keyword "template" prevents including header file in C++
---

diff --git a/src/rrd.h b/src/rrd.h
index 475720a4..84ff3e56 100644
--- a/src/rrd.h
+++ b/src/rrd.h
@@ -242,7 +242,7 @@ struct rrd_t;
     time_t last_up,
     int no_overwrite,
     const char **sources,
-    const char *template,
+    const char *_template,
     int argc,
     const char **argv);
     rrd_info_t *rrd_info_r(
diff --git a/src/rrd_client.h b/src/rrd_client.h
index 18b36e72..28ab5841 100644
--- a/src/rrd_client.h
+++ b/src/rrd_client.h
@@ -65,7 +65,7 @@ int rrdc_create_r2 (const char *filename,
     time_t last_up,
     int no_overwrite,
     const char **sources,
-    const char *template,
+    const char *_template,
     int argc,
     const char **argv);