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 | 00a0b0cbf358d5c53f64b239df381c73f277a65b (patch) | |
| tree | c21e357b1d18156d77ab286c7665a7c5b1847d9a /source3 | |
| parent | ae412ebe71cc77b7b19b75015c2bd910039d3d1b (diff) | |
| download | samba-00a0b0cbf358d5c53f64b239df381c73f277a65b.tar.gz samba-00a0b0cbf358d5c53f64b239df381c73f277a65b.tar.bz2 samba-00a0b0cbf358d5c53f64b239df381c73f277a65b.zip | |
r16484: Bugzilla 3805. Only define _ABS if it is not already defined.
(This used to be commit 09fb20f4fe26a5ec82e2f296bf033ab0864af669)
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/popt/popt.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source3/popt/popt.c b/source3/popt/popt.c index e9c4c17de5..ce3687fb64 100644 --- a/source3/popt/popt.c +++ b/source3/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) |