rdelaage
/
postgresql
mirror of https://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
Tom Lane 2004-12-26 23:20:12 +00:00
parent cdd402f8b3
commit 42f167f8b1
2 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/backend/utils/fmgr/fmgr.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/utils/fmgr/fmgr.c,v 1.86 2004/10/25 00:46:42 neilc Exp $ * $PostgreSQL: pgsql/src/backend/utils/fmgr/fmgr.c,v 1.87 2004/12/26 23:20:10 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -40,11 +40,10 @@
* *additionally* into %d0 for compatibility.) The price is that there are * *additionally* into %d0 for compatibility.) The price is that there are
* some warnings about int->pointer conversions... * some warnings about int->pointer conversions...
*/ */
#if defined(__mc68000__) && defined(__ELF__) #if (defined(__mc68000__) || (defined(__m68k__))) && defined(__ELF__)
typedef int32 ((*func_ptr) ()); typedef int32 (*func_ptr) ();
#else #else
typedef char *((*func_ptr) ()); typedef char * (*func_ptr) ();
#endif #endif
/* /*

9
src/backend/utils/init/miscinit.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/utils/init/miscinit.c,v 1.135 2004/10/09 23:13:06 tgl Exp $ * $PostgreSQL: pgsql/src/backend/utils/init/miscinit.c,v 1.136 2004/12/26 23:20:12 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -915,12 +915,7 @@ ValidatePgVersion(const char *path)
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
#if defined(__mc68000__) && defined(__ELF__) typedef void (*func_ptr) ();
typedef int32 ((*func_ptr) ());
#else
typedef char *((*func_ptr) ());
#endif
/* /*
* process any libraries that should be preloaded and * process any libraries that should be preloaded and