diff options
| author | James Peach <jpeach@samba.org> | 2006-06-23 06:19:45 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 11:18:57 -0500 |
| commit | 09fb20f4fe26a5ec82e2f296bf033ab0864af669 (patch) | |
| tree | 0dd16b08c67dab045302512b57689a0eec81a24a /source/popt | |
| parent | a22bf28bcab6ef3c4addaf57fdeb2020625ead0e (diff) | |
| download | samba-09fb20f4fe26a5ec82e2f296bf033ab0864af669.tar.gz samba-09fb20f4fe26a5ec82e2f296bf033ab0864af669.tar.xz samba-09fb20f4fe26a5ec82e2f296bf033ab0864af669.zip | |
r16484: Bugzilla 3805. Only define _ABS if it is not already defined.
Diffstat (limited to 'source/popt')
| -rw-r--r-- | source/popt/popt.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source/popt/popt.c b/source/popt/popt.c index e9c4c17de50..ce3687fb64e 100644 --- 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) |