From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Sun, 26 Dec 2004 23:20:12 +0000 (+0000)
Subject: Fix func_ptr declaration for netbsd-mac68k, per Rémi Zara.
X-Git-Url: http://git.postgresql.org/gitweb/static/gitweb.js?a=commitdiff_plain;h=c4a60f31146012ed4a914871df435bbac0179aad;p=users%2Fbernd%2Fpostgres.git

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

diff --git a/src/backend/utils/fmgr/fmgr.c b/src/backend/utils/fmgr/fmgr.c
index e890260d69..c7a4de92cc 100644
--- a/src/backend/utils/fmgr/fmgr.c
+++ b/src/backend/utils/fmgr/fmgr.c
@@ -40,11 +40,10 @@
  * *additionally* into %d0 for compatibility.) The price is that there are
  * some warnings about int->pointer conversions...
  */
-#if defined(__mc68000__) && defined(__ELF__)
-typedef int32 ((*func_ptr) ());
-
+#if (defined(__mc68000__) || (defined(__m68k__))) && defined(__ELF__)
+typedef int32  (*func_ptr) ();
 #else
-typedef char *((*func_ptr) ());
+typedef char * (*func_ptr) ();
 #endif
 
 /*
diff --git a/src/backend/utils/init/miscinit.c b/src/backend/utils/init/miscinit.c
index 2918bee91d..01bad208ff 100644
--- a/src/backend/utils/init/miscinit.c
+++ b/src/backend/utils/init/miscinit.c
@@ -915,12 +915,7 @@ ValidatePgVersion(const char *path)
  *-------------------------------------------------------------------------
  */
 
-#if defined(__mc68000__) && defined(__ELF__)
-typedef int32 ((*func_ptr) ());
-
-#else
-typedef char *((*func_ptr) ());
-#endif
+typedef void (*func_ptr) ();
 
 /*
  * process any libraries that should be preloaded and