Merge branch 'upstream'

[pkg-rrdtool.git] / src / rrd_format.c

diff --git a/src/rrd_format.c b/src/rrd_format.c
index b925b286cc1dd52fc5e2ab4d9fac2765e3877fef..548a3d1e496af66eee8efda337c94429368a6cf8 100644 (file)
--- a/src/rrd_format.c
+++ b/src/rrd_format.c
@@ -1,9 +1,9 @@
 /*****************************************************************************
- * RRDtool 1.3.1  Copyright by Tobi Oetiker, 1997-2008
+ * RRDtool 1.3.8  Copyright by Tobi Oetiker, 1997-2009
  *****************************************************************************
  * rrd_format.c  RRD Database Format helper functions
  *****************************************************************************
- * $Id: rrd_format.c 1447 2008-07-23 13:02:26Z oetiker $
+ * $Id: rrd_format.c 1801 2009-05-19 13:45:05Z oetiker $
  * $Log$
  * Revision 1.5  2004/05/18 18:53:03  oetiker
  * big spell checking patch -- slif@bellsouth.net
@@ -62,7 +62,7 @@ enum dst_en dst_conv(
         converter(DERIVE, DST_DERIVE)
         converter(COMPUTE, DST_CDEF)
         rrd_set_error("unknown data acquisition function '%s'", string);
-    return (-1);
+    return (enum dst_en)(-1);
 }
 
 
@@ -81,7 +81,7 @@ enum cf_en cf_conv(
         converter(DEVSEASONAL, CF_DEVSEASONAL)
         converter(FAILURES, CF_FAILURES)
         rrd_set_error("unknown consolidation function '%s'", string);
-    return (-1);
+    return (enum cf_en)(-1);
 }
 
 #undef converter