[PATCHES] Fix oldstyle_length regression test for netbsd-mac68k

[Rémi Zara]

Hi,
NetBSD mac68k's gcc does not define __mc68000__, but __m68k__
The following patch makes the oldstyle_length test pass on this platform
The change in miscinit is not necessary but for consistency sake (the  
return value of the func is not read).

Index: src/backend/utils/fmgr/fmgr.c
===
RCS file: /projects/cvsroot/pgsql/src/backend/utils/fmgr/fmgr.c,v
retrieving revision 1.86
diff -u -r1.86 fmgr.c
--- src/backend/utils/fmgr/fmgr.c   25 Oct 2004 00:46:42 -   
1.86
+++ src/backend/utils/fmgr/fmgr.c   25 Dec 2004 21:10:53 -
@@ -40,7 +40,7 @@
  * *additionally* into %d0 for compatibility.) The price is that there  
are
  * some warnings about int-pointer conversions...
  */
-#if defined(__mc68000__)  defined(__ELF__)
+#if (defined(__mc68000__) || (defined(__m68k__)))  defined(__ELF__)
 typedef int32 ((*func_ptr) ());

 #else
Index: src/backend/utils/init/miscinit.c
===
RCS file: /projects/cvsroot/pgsql/src/backend/utils/init/miscinit.c,v
retrieving revision 1.135
diff -u -r1.135 miscinit.c
--- src/backend/utils/init/miscinit.c   9 Oct 2004 23:13:06 -
1.135
+++ src/backend/utils/init/miscinit.c   25 Dec 2004 21:10:54 -
@@ -915,7 +915,7 @@
   
*--- 
--
  */

-#if defined(__mc68000__)  defined(__ELF__)
+#if (defined(__mc68000__) || (defined(__m68k__)))  defined(__ELF__)
 typedef int32 ((*func_ptr) ());
 #else
Regards,
Rémi Zara
--
Rémi Zara
http://www.remi-zara.net/


smime.p7s
Description: S/MIME cryptographic signature

Re: [PATCHES] Fix oldstyle_length regression test for netbsd-mac68k

[Tom Lane]

=?ISO-8859-1?Q?R=E9mi_Zara?= [EMAIL PROTECTED] writes:
 NetBSD mac68k's gcc does not define __mc68000__, but __m68k__
 The following patch makes the oldstyle_length test pass on this platform

Applied, thanks.

 The change in miscinit is not necessary but for consistency sake

Actually I think that one should just declare the function as returning
void ...

regards, tom lane

---(end of broadcast)---
TIP 2: you can get off all lists at once with the unregister command
(send unregister YourEmailAddressHere to [EMAIL PROTECTED])