mirror of
https://git.postgresql.org/git/postgresql.git
synced 2024-10-02 11:11:19 +02:00
Use Min() instead of min() in qsort, for consistency and to avoid
redefined-macro warnings on some platforms. Per gripe from Hiroshi Saito.
This commit is contained in:
parent
a50606de91
commit
b38900c767
@ -9,7 +9,7 @@
|
|||||||
*
|
*
|
||||||
* CAUTION: if you change this file, see also qsort_arg.c
|
* 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 $ */
|
/* $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 *));
|
int (*) (const void *, const void *));
|
||||||
static void swapfunc(char *, char *, size_t, int);
|
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,
|
* Qsort routine based on J. L. Bentley and M. D. McIlroy,
|
||||||
* "Engineering a sort function",
|
* "Engineering a sort function",
|
||||||
@ -192,9 +190,9 @@ loop:SWAPINIT(a, es);
|
|||||||
pc -= es;
|
pc -= es;
|
||||||
}
|
}
|
||||||
pn = (char *) a + n * 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);
|
vecswap(a, pb - r, r);
|
||||||
r = min(pd - pc, pn - pd - es);
|
r = Min(pd - pc, pn - pd - es);
|
||||||
vecswap(pb, pn - r, r);
|
vecswap(pb, pn - r, r);
|
||||||
if ((r = pb - pa) > es)
|
if ((r = pb - pa) > es)
|
||||||
qsort(a, r / es, es, cmp);
|
qsort(a, r / es, es, cmp);
|
||||||
|
@ -9,7 +9,7 @@
|
|||||||
*
|
*
|
||||||
* CAUTION: if you change this file, see also qsort.c
|
* 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 $ */
|
/* $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);
|
qsort_arg_comparator cmp, void *arg);
|
||||||
static void swapfunc(char *, char *, size_t, int);
|
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,
|
* Qsort routine based on J. L. Bentley and M. D. McIlroy,
|
||||||
* "Engineering a sort function",
|
* "Engineering a sort function",
|
||||||
@ -184,9 +182,9 @@ loop:SWAPINIT(a, es);
|
|||||||
pc -= es;
|
pc -= es;
|
||||||
}
|
}
|
||||||
pn = (char *) a + n * 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);
|
vecswap(a, pb - r, r);
|
||||||
r = min(pd - pc, pn - pd - es);
|
r = Min(pd - pc, pn - pd - es);
|
||||||
vecswap(pb, pn - r, r);
|
vecswap(pb, pn - r, r);
|
||||||
if ((r = pb - pa) > es)
|
if ((r = pb - pa) > es)
|
||||||
qsort_arg(a, r / es, es, cmp, arg);
|
qsort_arg(a, r / es, es, cmp, arg);
|
||||||
|
Loading…
Reference in New Issue
Block a user