summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Lane2000-12-31 03:34:01 +0000
committerTom Lane2000-12-31 03:34:01 +0000
commitfada8ee41f166fb1cb2c6ce000f9b746b9142379 (patch)
treeb8f9ebc6e592b892cf4ddb98e7a619c05816c870
parent4723b2b99bc2d4b52a7c8a047485707aeb643895 (diff)
NetBSD/Alpha porting fixes from [email protected].
-rw-r--r--src/backend/main/main.c7
-rw-r--r--src/include/port/netbsd.h14
2 files changed, 14 insertions, 7 deletions
diff --git a/src/backend/main/main.c b/src/backend/main/main.c
index 81f4c37219d..66ccbee7180 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 63e42362480..aba5c72fe62 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(__powerpc__)
+#if defined(__alpha__)
#define HAS_TEST_AND_SET
+typedef unsigned long slock_t;
#endif
#if defined(__powerpc__)
+#define HAS_TEST_AND_SET
typedef unsigned int slock_t;
-
-#else
-typedef unsigned char slock_t;
-
#endif