diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/utils/fmgr/fmgr.c | 9 | ||||
| -rw-r--r-- | src/backend/utils/init/miscinit.c | 9 |
2 files changed, 6 insertions, 12 deletions
diff --git a/src/backend/utils/fmgr/fmgr.c b/src/backend/utils/fmgr/fmgr.c index b151edd6332..bd4daf49f47 100644 --- a/src/backend/utils/fmgr/fmgr.c +++ b/src/backend/utils/fmgr/fmgr.c @@ -8,7 +8,7 @@ * * * 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 * 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 5a81c0467b3..c560b64414a 100644 --- a/src/backend/utils/init/miscinit.c +++ b/src/backend/utils/init/miscinit.c @@ -8,7 +8,7 @@ * * * 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 int32 ((*func_ptr) ()); - -#else -typedef char *((*func_ptr) ()); -#endif +typedef void (*func_ptr) (); /* * process any libraries that should be preloaded and |