r16484: Bugzilla 3805. Only define _ABS if it is not already defined.

diff --git a/source/popt/popt.c b/source/popt/popt.c
index e9c4c17de50369105378de6409f7cb399ec701cf..ce3687fb64e99e1eff4e48e7927f4711eb115c18 100644 (file)
--- a/source/popt/popt.c
+++ b/source/popt/popt.c
@@ -927,7 +927,9 @@ int poptGetNextOpt(poptContext con)
                    if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_DOUBLE) {
                        *((double *) opt->arg) = aDouble;
                    } else {
+#ifndef _ABS
 #define _ABS(a)        ((((a) - 0.0) < DBL_EPSILON) ? -(a) : (a))
+#endif
                        if ((_ABS(aDouble) - FLT_MAX) > DBL_EPSILON)
                            return POPT_ERROR_OVERFLOW;
                        if ((FLT_MIN - _ABS(aDouble)) > DBL_EPSILON)