Commitfada8ee

committed

NetBSD/Alpha porting fixes from tom@minnesota.com.

1 parent4723b2b commitfada8eeCopy full SHA for fada8ee

File tree

+14

-7

lines changed

+14

-7

lines changed

Lines changed: 5 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`*`
`14`	`14`	`*`
`15`	`15`	`* IDENTIFICATION`
`16`		`- * $Header: /cvsroot/pgsql/src/backend/main/main.c,v 1.35 2000/11/25 03:45:47 tgl Exp $`
	`16`	`+ * $Header: /cvsroot/pgsql/src/backend/main/main.c,v 1.36 2000/12/31 03:34:01 tgl Exp $`
`17`	`17`	`*`
`18`	`18`	`*-------------------------------------------------------------------------`
`19`	`19`	`*/`
`@@ -25,13 +25,16 @@`
`25`	`25`	`#include<locale.h>`
`26`	`26`	`#endif`
`27`	`27`
`28`		`-#if defined(__alpha)&& !defined(linux)&& !defined(__FreeBSD__)`
	`28`	`+#if defined(__alpha)&& !defined(linux)&& !defined(__FreeBSD__)&& !defined(__NetBSD__)`
`29`	`29`	`#include<sys/sysinfo.h>`
`30`	`30`	`#include"machine/hal_sysinfo.h"`
`31`	`31`	`#defineASSEMBLER`
`32`	`32`	`#include<sys/proc.h>`
`33`	`33`	`#undef ASSEMBLER`
`34`	`34`	`#endif`
	`35`	`+#if defined(__NetBSD__)`
	`36`	`+#include<sys/param.h>`
	`37`	`+#endif`
`35`	`38`
`36`	`39`	`#include"miscadmin.h"`
`37`	`40`	`#include"bootstrap/bootstrap.h"`

Lines changed: 9 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,43 +1,47 @@`
`1`	`1`	`#if defined(__i386__)`
`2`	`2`	`#defineNEED_I386_TAS_ASM`
`3`	`3`	`#defineHAS_TEST_AND_SET`
	`4`	`+typedefunsignedcharslock_t;`
`4`	`5`	`#endif`
`5`	`6`
`6`	`7`	`#if defined(__sparc__)`
`7`	`8`	`#defineNEED_SPARC_TAS_ASM`
`8`	`9`	`#defineHAS_TEST_AND_SET`
	`10`	`+typedefunsignedcharslock_t;`
`9`	`11`	`#endif`
`10`	`12`
`11`	`13`	`#if defined(__vax__)`
`12`	`14`	`#defineNEED_VAX_TAS_ASM`
`13`	`15`	`#defineHAS_TEST_AND_SET`
	`16`	`+typedefunsignedcharslock_t;`
`14`	`17`	`#endif`
`15`	`18`
`16`	`19`	`#if defined(__ns32k__)`
`17`	`20`	`#defineNEED_NS32K_TAS_ASM`
`18`	`21`	`#defineHAS_TEST_AND_SET`
	`22`	`+typedefunsignedcharslock_t;`
`19`	`23`	`#endif`
`20`	`24`
`21`	`25`	`#if defined(__m68k__)`
`22`	`26`	`#defineHAS_TEST_AND_SET`
	`27`	`+typedefunsignedcharslock_t;`
`23`	`28`	`#endif`
`24`	`29`
`25`	`30`	`#if defined(__arm__)`
`26`	`31`	`#defineHAS_TEST_AND_SET`
	`32`	`+typedefunsignedcharslock_t;`
`27`	`33`	`#endif`
`28`	`34`
`29`	`35`	`#if defined(__mips__)`
`30`	`36`	`/* #undef HAS_TEST_AND_SET */`
`31`	`37`	`#endif`
`32`	`38`
`33`		`-#if defined(__powerpc__)`
	`39`	`+#if defined(__alpha__)`
`34`	`40`	`#defineHAS_TEST_AND_SET`
	`41`	`+typedefunsigned longslock_t;`
`35`	`42`	`#endif`
`36`	`43`
`37`	`44`	`#if defined(__powerpc__)`
	`45`	`+#defineHAS_TEST_AND_SET`
`38`	`46`	`typedefunsignedintslock_t;`
`39`		`-`
`40`		`-#else`
`41`		`-typedefunsignedcharslock_t;`
`42`		`-`
`43`	`47`	`#endif`

Comments

(0)