Commit42f167f

committed

Fix func_ptr declaration for netbsd-mac68k, per Rémi Zara.

1 parentcdd402f commit42f167fCopy full SHA for 42f167f

File tree

-12

lines changed

-12

lines changed

Lines changed: 4 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $PostgreSQL: pgsql/src/backend/utils/fmgr/fmgr.c,v 1.86 2004/10/25 00:46:42 neilc Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/backend/utils/fmgr/fmgr.c,v 1.87 2004/12/26 23:20:10 tgl Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -40,11 +40,10 @@`
`40`	`40`	`* additionally into %d0 for compatibility.) The price is that there are`
`41`	`41`	`* some warnings about int->pointer conversions...`
`42`	`42`	`*/`
`43`		`-#if defined(__mc68000__)&& defined(__ELF__)`
`44`		`-typedefint32 ((*func_ptr) ());`
`45`		`-`
	`43`	`+#if (defined(__mc68000__)\|\| (defined(__m68k__)))&& defined(__ELF__)`
	`44`	`+typedefint32 (*func_ptr) ();`
`46`	`45`	`#else`
`47`		`-typedefchar((func_ptr) ());`
	`46`	`+typedefchar* (*func_ptr) ();`
`48`	`47`	`#endif`
`49`	`48`
`50`	`49`	`/*`

Lines changed: 2 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $PostgreSQL: pgsql/src/backend/utils/init/miscinit.c,v 1.135 2004/10/09 23:13:06 tgl Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/backend/utils/init/miscinit.c,v 1.136 2004/12/26 23:20:12 tgl Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -915,12 +915,7 @@ ValidatePgVersion(const char *path)`
`915`	`915`	`*-------------------------------------------------------------------------`
`916`	`916`	`*/`
`917`	`917`
`918`		`-#if defined(__mc68000__)&& defined(__ELF__)`
`919`		`-typedefint32 ((*func_ptr) ());`
`920`		`-`
`921`		`-#else`
`922`		`-typedefchar((func_ptr) ());`
`923`		`-#endif`
	`918`	`+typedefvoid (*func_ptr) ();`
`924`	`919`
`925`	`920`	`/*`
`926`	`921`	`* process any libraries that should be preloaded and`

Comments

(0)