OSSP CVS Repository

ossp - Check-in [3172]
Not logged in
[Honeypot]  [Browse]  [Home]  [Login]  [Reports
[Search]  [Ticket]  [Timeline
  [Patchset]  [Tagging/Branching

Check-in Number: 3172
Date: 2003-Feb-06 16:06:28 (local)
2003-Feb-06 15:06:28 (UTC)
User:thl
Branch:
Comment: avoid name space conflict on solaris
Tickets:
Inspections:
Files:
ossp-pkg/popt/popt.c      1.4 -> 1.5     3 inserted, 3 deleted

ossp-pkg/popt/popt.c 1.4 -> 1.5

--- popt.c       2003/02/06 15:05:36     1.4
+++ popt.c       2003/02/06 15:06:28     1.5
@@ -1037,10 +1037,10 @@
                                                                 *((double *)opt->arg) = aDouble;
                                                         }
                                                         else {
-#define _ABS(a) ((((a) - 0.0) < DBL_EPSILON) ? -(a) : (a))
-                                                                if ((_ABS(aDouble) - FLT_MAX) > DBL_EPSILON)
+#define POPT_ABS(a)     ((((a) - 0.0) < DBL_EPSILON) ? -(a) : (a))
+                                                                if ((POPT_ABS(aDouble) - FLT_MAX) > DBL_EPSILON)
                                                                         return POPT_ERROR_OVERFLOW;
-                                                                if ((FLT_MIN - _ABS(aDouble)) > DBL_EPSILON)
+                                                                if ((FLT_MIN - POPT_ABS(aDouble)) > DBL_EPSILON)
                                                                         return POPT_ERROR_OVERFLOW;
                                                                 *((float *)opt->arg) = aDouble;
                                                         }

CVSTrac 2.0.1