diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2006-10-12 15:04:55 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2006-10-12 15:04:55 +0000 |
| commit | b38900c7677657a815e75781b776fb1e41054df3 (patch) | |
| tree | e841b1c22fadddf19af3105112a2bf3fee503106 | |
| parent | a50606de91fea47120daea9686956bcf0bc52bac (diff) | |
| download | postgresql-b38900c7677657a815e75781b776fb1e41054df3.tar.gz postgresql-b38900c7677657a815e75781b776fb1e41054df3.zip | |
Use Min() instead of min() in qsort, for consistency and to avoid
redefined-macro warnings on some platforms. Per gripe from Hiroshi Saito.
| -rw-r--r-- | src/port/qsort.c | 8 | ||||
| -rw-r--r-- | src/port/qsort_arg.c | 8 |
2 files changed, 6 insertions, 10 deletions
diff --git a/src/port/qsort.c b/src/port/qsort.c index 3f3e7787e9f..8496f0a1d63 100644 --- a/src/port/qsort.c +++ b/src/port/qsort.c @@ -9,7 +9,7 @@ * * CAUTION: if you change this file, see also qsort_arg.c * - * $PostgreSQL: pgsql/src/port/qsort.c,v 1.10 2006/10/03 22:18:23 tgl Exp $ + * $PostgreSQL: pgsql/src/port/qsort.c,v 1.11 2006/10/12 15:04:55 tgl Exp $ */ /* $NetBSD: qsort.c,v 1.13 2003/08/07 16:43:42 agc Exp $ */ @@ -50,8 +50,6 @@ static char *med3(char *, char *, char *, int (*) (const void *, const void *)); static void swapfunc(char *, char *, size_t, int); -#define min(a, b) ((a) < (b) ? (a) : (b)) - /* * Qsort routine based on J. L. Bentley and M. D. McIlroy, * "Engineering a sort function", @@ -192,9 +190,9 @@ loop:SWAPINIT(a, es); pc -= es; } pn = (char *) a + n * es; - r = min(pa - (char *) a, pb - pa); + r = Min(pa - (char *) a, pb - pa); vecswap(a, pb - r, r); - r = min(pd - pc, pn - pd - es); + r = Min(pd - pc, pn - pd - es); vecswap(pb, pn - r, r); if ((r = pb - pa) > es) qsort(a, r / es, es, cmp); diff --git a/src/port/qsort_arg.c b/src/port/qsort_arg.c index 9e69462f0ad..f21f141c425 100644 --- a/src/port/qsort_arg.c +++ b/src/port/qsort_arg.c @@ -9,7 +9,7 @@ * * CAUTION: if you change this file, see also qsort.c * - * $PostgreSQL: pgsql/src/port/qsort_arg.c,v 1.2 2006/10/04 00:30:14 momjian Exp $ + * $PostgreSQL: pgsql/src/port/qsort_arg.c,v 1.3 2006/10/12 15:04:55 tgl Exp $ */ /* $NetBSD: qsort.c,v 1.13 2003/08/07 16:43:42 agc Exp $ */ @@ -50,8 +50,6 @@ static char *med3(char *a, char *b, char *c, qsort_arg_comparator cmp, void *arg); static void swapfunc(char *, char *, size_t, int); -#define min(a, b) ((a) < (b) ? (a) : (b)) - /* * Qsort routine based on J. L. Bentley and M. D. McIlroy, * "Engineering a sort function", @@ -184,9 +182,9 @@ loop:SWAPINIT(a, es); pc -= es; } pn = (char *) a + n * es; - r = min(pa - (char *) a, pb - pa); + r = Min(pa - (char *) a, pb - pa); vecswap(a, pb - r, r); - r = min(pd - pc, pn - pd - es); + r = Min(pd - pc, pn - pd - es); vecswap(pb, pn - r, r); if ((r = pb - pa) > es) qsort_arg(a, r / es, es, cmp, arg); |