From: Amos Jeffries <squid3@treenet.co.nz>
Date: Mon, 18 Apr 2011 12:00:32 +0000 (-0600)
Subject: Portability: allow GnuRegex to use libcompat min()/max()
X-Git-Tag: SQUID_3_1_12_1~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d7394f0d204cfd9d7d393551a1b45e8d494aaf41;p=thirdparty%2Fsquid.git

Portability: allow GnuRegex to use libcompat min()/max()
---

diff --git a/compat/GnuRegex.c b/compat/GnuRegex.c
index 08f8deeb9e..5b93185ba4 100644
--- a/compat/GnuRegex.c
+++ b/compat/GnuRegex.c
@@ -235,9 +235,6 @@ char *alloca();
 
 #define STREQ(s1, s2) ((strcmp (s1, s2) == 0))
 
-#define MAX(a, b) ((a) > (b) ? (a) : (b))
-#define MIN(a, b) ((a) < (b) ? (a) : (b))
-
 #if !defined(__MINGW32__)	/* MinGW defines boolean */
 typedef char boolean;
 #endif
@@ -3141,7 +3138,7 @@ restore_best_regs:
                 if (bufp->regs_allocated == REGS_UNALLOCATED) {		/* No.  So allocate them with malloc.  We need one
 									 * extra element beyond `num_regs' for the `-1' marker
 									 * GNU code uses.  */
-                    regs->num_regs = MAX(RE_NREGS, num_regs + 1);
+                    regs->num_regs = max(RE_NREGS, num_regs + 1);
                     regs->start = TALLOC(regs->num_regs, regoff_t);
                     regs->end = TALLOC(regs->num_regs, regoff_t);
                     if (regs->start == NULL || regs->end == NULL)
@@ -3170,7 +3167,7 @@ restore_best_regs:
                 }
                 /* Go through the first `min (num_regs, regs->num_regs)'
                  * registers, since that is all we initialized.  */
-                for (mcnt = 1; mcnt < MIN(num_regs, regs->num_regs); mcnt++) {
+                for (mcnt = 1; mcnt < min(num_regs, regs->num_regs); mcnt++) {
                     if (REG_UNSET(regstart[mcnt]) || REG_UNSET(regend[mcnt]))
                         regs->start[mcnt] = regs->end[mcnt] = -1;
                     else {