diff options
| author | Tomáš Kopal <Tomas.Kopal@eccam.com> | 2021-03-17 11:18:33 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-17 12:18:33 +0200 |
| commit | 757e418090e1038b183d3776aa8a3c55260369ca (patch) | |
| tree | f53db26063920be1299776ae138140f9e94aa655 /database | |
| parent | de2ac5a34b1212c0b024dd9676816e19ea809485 (diff) | |
Rename abs to ABS to avoid clash with standard definitions. Fixes #10353. (#10354)
Diffstat (limited to 'database')
| -rw-r--r-- | database/rrddim.c | 2 | ||||
| -rw-r--r-- | database/rrdset.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/database/rrddim.c b/database/rrddim.c index b08300cd0f..b4ea34d2d9 100644 --- a/database/rrddim.c +++ b/database/rrddim.c @@ -423,7 +423,7 @@ RRDDIM *rrddim_add_custom(RRDSET *st, const char *id, const char *name, collecte else { RRDDIM *td = st->dimensions; - if(td->algorithm != rd->algorithm || abs(td->multiplier) != abs(rd->multiplier) || abs(td->divisor) != abs(rd->divisor)) { + if(td->algorithm != rd->algorithm || ABS(td->multiplier) != ABS(rd->multiplier) || ABS(td->divisor) != ABS(rd->divisor)) { if(!rrdset_flag_check(st, RRDSET_FLAG_HETEROGENEOUS)) { #ifdef NETDATA_INTERNAL_CHECKS info("Dimension '%s' added on chart '%s' of host '%s' is not homogeneous to other dimensions already present (algorithm is '%s' vs '%s', multiplier is " COLLECTED_NUMBER_FORMAT " vs " COLLECTED_NUMBER_FORMAT ", divisor is " COLLECTED_NUMBER_FORMAT " vs " COLLECTED_NUMBER_FORMAT ").", diff --git a/database/rrdset.c b/database/rrdset.c index 1594c94af9..15640d3ed8 100644 --- a/database/rrdset.c +++ b/database/rrdset.c @@ -219,11 +219,11 @@ inline void rrdset_update_heterogeneous_flag(RRDSET *st) { rrdset_flag_clear(st, RRDSET_FLAG_HOMOGENEOUS_CHECK); RRD_ALGORITHM algorithm = st->dimensions->algorithm; - collected_number multiplier = abs(st->dimensions->multiplier); - collected_number divisor = abs(st->dimensions->divisor); + collected_number multiplier = ABS(st->dimensions->multiplier); + collected_number divisor = ABS(st->dimensions->divisor); rrddim_foreach_read(rd, st) { - if(algorithm != rd->algorithm || multiplier != abs(rd->multiplier) || divisor != abs(rd->divisor)) { + if(algorithm != rd->algorithm || multiplier != ABS(rd->multiplier) || divisor != ABS(rd->divisor)) { if(!rrdset_flag_check(st, RRDSET_FLAG_HETEROGENEOUS)) { #ifdef NETDATA_INTERNAL_CHECKS info("Dimension '%s' added on chart '%s' of host '%s' is not homogeneous to other dimensions already present (algorithm is '%s' vs '%s', multiplier is " COLLECTED_NUMBER_FORMAT " vs " COLLECTED_NUMBER_FORMAT ", divisor is " COLLECTED_NUMBER_FORMAT " vs " COLLECTED_NUMBER_FORMAT ").", |