Commitb38900c

committed

Use Min() instead of min() in qsort, for consistency and to avoid

redefined-macro warnings on some platforms. Per gripe from Hiroshi Saito.

1 parenta50606d commitb38900cCopy full SHA for b38900c

File tree

-10

lines changed

-10

lines changed

Lines changed: 3 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`*`
`10`	`10`	`*CAUTION: if you change this file, see also qsort_arg.c`
`11`	`11`	`*`
`12`		`- *$PostgreSQL: pgsql/src/port/qsort.c,v 1.10 2006/10/03 22:18:23 tgl Exp $`
	`12`	`+ *$PostgreSQL: pgsql/src/port/qsort.c,v 1.11 2006/10/12 15:04:55 tgl Exp $`
`13`	`13`	`*/`
`14`	`14`
`15`	`15`	`/$NetBSD: qsort.c,v 1.13 2003/08/07 16:43:42 agc Exp $/`
`@@ -50,8 +50,6 @@ static char med3(char , char , char ,`
`50`	`50`	`int () (constvoid,constvoid*));`
`51`	`51`	`staticvoidswapfunc(char,char,size_t,int);`
`52`	`52`
`53`		`-#definemin(a,b)((a) < (b) ? (a) : (b))`
`54`		`-`
`55`	`53`	`/*`
`56`	`54`	`* Qsort routine based on J. L. Bentley and M. D. McIlroy,`
`57`	`55`	`* "Engineering a sort function",`
`@@ -192,9 +190,9 @@ loop:SWAPINIT(a, es);`
`192`	`190`	`pc-=es;`
`193`	`191`	`}`
`194`	`192`	`pn= (char)a+nes;`
`195`		`-r=min(pa- (char*)a,pb-pa);`
	`193`	`+r=Min(pa- (char*)a,pb-pa);`
`196`	`194`	`vecswap(a,pb-r,r);`
`197`		`-r=min(pd-pc,pn-pd-es);`
	`195`	`+r=Min(pd-pc,pn-pd-es);`
`198`	`196`	`vecswap(pb,pn-r,r);`
`199`	`197`	`if ((r=pb-pa)>es)`
`200`	`198`	`qsort(a,r /es,es,cmp);`

Lines changed: 3 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`*`
`10`	`10`	`*CAUTION: if you change this file, see also qsort.c`
`11`	`11`	`*`
`12`		`- *$PostgreSQL: pgsql/src/port/qsort_arg.c,v 1.2 2006/10/04 00:30:14 momjian Exp $`
	`12`	`+ *$PostgreSQL: pgsql/src/port/qsort_arg.c,v 1.3 2006/10/12 15:04:55 tgl Exp $`
`13`	`13`	`*/`
`14`	`14`
`15`	`15`	`/$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,`
`50`	`50`	`qsort_arg_comparatorcmp,void*arg);`
`51`	`51`	`staticvoidswapfunc(char,char,size_t,int);`
`52`	`52`
`53`		`-#definemin(a,b)((a) < (b) ? (a) : (b))`
`54`		`-`
`55`	`53`	`/*`
`56`	`54`	`* Qsort routine based on J. L. Bentley and M. D. McIlroy,`
`57`	`55`	`* "Engineering a sort function",`
`@@ -184,9 +182,9 @@ loop:SWAPINIT(a, es);`
`184`	`182`	`pc-=es;`
`185`	`183`	`}`
`186`	`184`	`pn= (char)a+nes;`
`187`		`-r=min(pa- (char*)a,pb-pa);`
	`185`	`+r=Min(pa- (char*)a,pb-pa);`
`188`	`186`	`vecswap(a,pb-r,r);`
`189`		`-r=min(pd-pc,pn-pd-es);`
	`187`	`+r=Min(pd-pc,pn-pd-es);`
`190`	`188`	`vecswap(pb,pn-r,r);`
`191`	`189`	`if ((r=pb-pa)>es)`
`192`	`190`	`qsort_arg(a,r /es,es,cmp,arg);`

Comments

(0)