From fada8ee41f166fb1cb2c6ce000f9b746b9142379 Mon Sep 17 00:00:00 2001
From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Sun, 31 Dec 2000 03:34:01 +0000
Subject: [PATCH] NetBSD/Alpha porting fixes from tom@minnesota.com.

---
 src/backend/main/main.c   |  7 +++++--
 src/include/port/netbsd.h | 18 +++++++++++-------
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/src/backend/main/main.c b/src/backend/main/main.c
index 81f4c37219..66ccbee718 100644
--- a/src/backend/main/main.c
+++ b/src/backend/main/main.c
@@ -13,7 +13,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/main/main.c,v 1.35 2000/11/25 03:45:47 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/main/main.c,v 1.36 2000/12/31 03:34:01 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -25,13 +25,16 @@
 #include <locale.h>
 #endif
 
-#if defined(__alpha) && !defined(linux) && !defined(__FreeBSD__)
+#if defined(__alpha) && !defined(linux) && !defined(__FreeBSD__) && !defined(__NetBSD__)
 #include <sys/sysinfo.h>
 #include "machine/hal_sysinfo.h"
 #define ASSEMBLER
 #include <sys/proc.h>
 #undef ASSEMBLER
 #endif
+#if defined(__NetBSD__)
+#include <sys/param.h>
+#endif
 
 #include "miscadmin.h"
 #include "bootstrap/bootstrap.h"
diff --git a/src/include/port/netbsd.h b/src/include/port/netbsd.h
index 63e4236248..aba5c72fe6 100644
--- a/src/include/port/netbsd.h
+++ b/src/include/port/netbsd.h
@@ -1,43 +1,47 @@
 #if defined(__i386__)
 #define NEED_I386_TAS_ASM
 #define HAS_TEST_AND_SET
+typedef unsigned char slock_t;
 #endif
 
 #if defined(__sparc__)
 #define NEED_SPARC_TAS_ASM
 #define HAS_TEST_AND_SET
+typedef unsigned char slock_t;
 #endif
 
 #if defined(__vax__)
 #define NEED_VAX_TAS_ASM
 #define HAS_TEST_AND_SET
+typedef unsigned char slock_t;
 #endif
 
 #if defined(__ns32k__)
 #define NEED_NS32K_TAS_ASM
 #define HAS_TEST_AND_SET
+typedef unsigned char slock_t;
 #endif
 
 #if defined(__m68k__)
 #define HAS_TEST_AND_SET
+typedef unsigned char slock_t;
 #endif
 
 #if defined(__arm__)
 #define HAS_TEST_AND_SET
+typedef unsigned char slock_t;
 #endif
 
 #if defined(__mips__)
 /* #	undef HAS_TEST_AND_SET */
 #endif
 
+#if defined(__alpha__)
+#define HAS_TEST_AND_SET
+typedef unsigned long slock_t;
+#endif
+
 #if defined(__powerpc__)
 #define HAS_TEST_AND_SET
-#endif
-
-#if defined(__powerpc__)
 typedef unsigned int slock_t;
-
-#else
-typedef unsigned char slock_t;
-
 #endif