Commit4887f5f

committed

Rename our substitute qsort to pg_qsort at the link-symbol level (but

provide a macro so code can still just say qsort). Avoids linker warningson pickier platforms such as Darwin, and outright failure on MSVC.

1 parent443abd8 commit4887f5fCopy full SHA for 4887f5f

File tree

+11

-14

lines changed

+11

-14

lines changed

Lines changed: 6 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`* Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group`
`7`	`7`	`* Portions Copyright (c) 1994, Regents of the University of California`
`8`	`8`	`*`
`9`		`- * $PostgreSQL: pgsql/src/include/port.h,v 1.104 2006/10/04 00:30:06 momjian Exp $`
	`9`	`+ * $PostgreSQL: pgsql/src/include/port.h,v 1.105 2006/10/19 20:56:22 tgl Exp $`
`10`	`10`	`*`
`11`	`11`	`*-------------------------------------------------------------------------`
`12`	`12`	`*/`
`@@ -363,6 +363,11 @@ extern int pqGethostbyname(const char *name,`
`363`	`363`	`structhostent**result,`
`364`	`364`	`int*herrno);`
`365`	`365`
	`366`	`+externvoidpg_qsort(void*base,size_tnel,size_telsize,`
	`367`	`+int (cmp) (constvoid,constvoid*));`
	`368`	`+`
	`369`	`+#defineqsort(a,b,c,d) pg_qsort(a,b,c,d)`
	`370`	`+`
`366`	`371`	`typedefint (qsort_arg_comparator) (constvoida,constvoidb,voidarg);`
`367`	`372`
`368`	`373`	`externvoidqsort_arg(void*base,size_tnel,size_telsize,`

Lines changed: 5 additions & 13 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.11 2006/10/12 15:04:55 tgl Exp $`
	`12`	`+ *$PostgreSQL: pgsql/src/port/qsort.c,v 1.12 2006/10/19 20:56:22 tgl Exp $`
`13`	`13`	`*/`
`14`	`14`
`15`	`15`	`/$NetBSD: qsort.c,v 1.13 2003/08/07 16:43:42 agc Exp $/`
`@@ -46,8 +46,8 @@`
`46`	`46`	`#include"c.h"`
`47`	`47`
`48`	`48`
`49`		`-staticcharmed3(char,char,char,`
`50`		`-int () (constvoid,constvoid*));`
	`49`	`+staticcharmed3(chara,charb,charc,`
	`50`	`+int (cmp) (constvoid,constvoid*));`
`51`	`51`	`staticvoidswapfunc(char,char,size_t,int);`
`52`	`52`
`53`	`53`	`/*`
`@@ -96,23 +96,15 @@ intswaptype;`
`96`	`96`	`#definevecswap(a,b,n) if ((n) > 0) swapfunc((a), (b), (size_t)(n), swaptype)`
`97`	`97`
`98`	`98`	`staticchar*`
`99`		`-med3(a,b,c,cmp)`
`100`		`-char*a,`
`101`		`-*b,`
`102`		`-*c;`
`103`		`-int(cmp) (constvoid,constvoid*);`
	`99`	`+med3(chara,charb,charc,int (cmp) (constvoid,constvoid))`
`104`	`100`	`{`
`105`	`101`	`returncmp(a,b)<0 ?`
`106`	`102`	`(cmp(b,c)<0 ?b : (cmp(a,c)<0 ?c :a))`
`107`	`103`	`: (cmp(b,c)>0 ?b : (cmp(a,c)<0 ?a :c));`
`108`	`104`	`}`
`109`	`105`
`110`	`106`	`void`
`111`		`-qsort(a,n,es,cmp)`
`112`		`-void*a;`
`113`		`-size_tn,`
`114`		`-es;`
`115`		`-int(cmp) (constvoid,constvoid*);`
	`107`	`+pg_qsort(voida,size_tn,size_tes,int (cmp) (constvoid,constvoid))`
`116`	`108`	`{`
`117`	`109`	`char*pa,`
`118`	`110`	`*pb,`

Comments

(0)