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 /libnetdata | |
| parent | de2ac5a34b1212c0b024dd9676816e19ea809485 (diff) | |
Rename abs to ABS to avoid clash with standard definitions. Fixes #10353. (#10354)
Diffstat (limited to 'libnetdata')
| -rw-r--r-- | libnetdata/eval/eval.c | 2 | ||||
| -rw-r--r-- | libnetdata/libnetdata.h | 6 | ||||
| -rw-r--r-- | libnetdata/tests/test_str2ld.c | 2 |
3 files changed, 3 insertions, 7 deletions
diff --git a/libnetdata/eval/eval.c b/libnetdata/eval/eval.c index b53b070394..7ca45882f7 100644 --- a/libnetdata/eval/eval.c +++ b/libnetdata/eval/eval.c @@ -296,7 +296,7 @@ calculated_number eval_abs(EVAL_EXPRESSION *exp, EVAL_NODE *op, int *error) { calculated_number n1 = eval_value(exp, &op->ops[0], error); if(isnan(n1)) return NAN; if(isinf(n1)) return INFINITY; - return abs(n1); + return ABS(n1); } calculated_number eval_if_then_else(EVAL_EXPRESSION *exp, EVAL_NODE *op, int *error) { if(is_true(eval_value(exp, &op->ops[0], error))) diff --git a/libnetdata/libnetdata.h b/libnetdata/libnetdata.h index 99b943740c..2122738705 100644 --- a/libnetdata/libnetdata.h +++ b/libnetdata/libnetdata.h @@ -205,11 +205,7 @@ extern "C" { #define WARNUNUSED #endif -#ifdef abs -#undef abs -#endif -#define abs(x) (((x) < 0)? (-(x)) : (x)) - +#define ABS(x) (((x) < 0)? (-(x)) : (x)) #define MIN(a,b) (((a)<(b))?(a):(b)) #define MAX(a,b) (((a)>(b))?(a):(b)) diff --git a/libnetdata/tests/test_str2ld.c b/libnetdata/tests/test_str2ld.c index 9d59f6c0e2..01d8677f02 100644 --- a/libnetdata/tests/test_str2ld.c +++ b/libnetdata/tests/test_str2ld.c @@ -32,7 +32,7 @@ static void test_str2ld(void **state) else if (isinf(mine)) assert_true(isinf(sys)); else if (mine != sys) - assert_false(abs(mine - sys) > 0.000001); + assert_false(ABS(mine - sys) > 0.000001); assert_ptr_equal(e_mine, e_sys); } |