Skip site navigation (1) Skip section navigation (2)

Fix oldstyle_length regression test for netbsd-mac68k

From: Rémi Zara <remi_zara(at)mac(dot)com>
To: pgsql-patches(at)postgresql(dot)org
Subject: Fix oldstyle_length regression test for netbsd-mac68k
Date: 2004-12-26 22:30:41
Message-ID: C8FF341A-578D-11D9-B54B-003065B81B34@mac.com (view raw or flat)
Thread:
Lists: pgsql-patches
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 -0000       
1.86
+++ src/backend/utils/fmgr/fmgr.c       25 Dec 2004 21:10:53 -0000
@@ -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 -0000        
1.135
+++ src/backend/utils/init/miscinit.c   25 Dec 2004 21:10:54 -0000
@@ -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/

Responses

pgsql-patches by date

Next:From: Tom LaneDate: 2004-12-26 23:21:16
Subject: Re: Fix oldstyle_length regression test for netbsd-mac68k
Previous:From: Tom LaneDate: 2004-12-26 19:21:41
Subject: Re: MSVC compile errors

Privacy Policy | About PostgreSQL
Copyright © 1996-2014 The PostgreSQL Global Development Group