From: Peter A. Bigot Date: Sun, 25 May 2014 03:50:12 +0000 (-0500) Subject: rrdcached: fix issue building on 32-bit hosts X-Git-Tag: v1.5.0-rc1~79^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F499%2Fhead;p=thirdparty%2Frrdtool-1.x.git rrdcached: fix issue building on 32-bit hosts Conditionally compiled code referenced local variables that no longer exist; use the new references. Signed-off-by: Peter A. Bigot --- diff --git a/src/rrd_create.c b/src/rrd_create.c index bfc99380..18781fae 100644 --- a/src/rrd_create.c +++ b/src/rrd_create.c @@ -356,7 +356,7 @@ int parseRRA(const char *def, &rra_def->row_cnt))) rrd_set_error("Invalid row count %s: %s", token, parsetime_error); #if SIZEOF_TIME_T == 4 - if ((long long) pdp_step * rra_def->pdp_cnt * row_cnt > 4294967296LL){ + if (((long long) rrd->stat_head->pdp_step * rra_def->pdp_cnt) * rra_def->row_cnt > 4294967296LL){ /* database timespan > 2**32, would overflow time_t */ rrd_set_error("The time spanned by the database is too large: must be <= 4294967296 seconds"); }