diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 1995-10-26 01:16:48 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 1995-10-26 01:16:48 +0000 |
| commit | c90daa1186258d136f2f45d20dbf698b4daee12c (patch) | |
| tree | 79a0532cce031876ebb04319c41814628041c71a /sys/arch/vax/include | |
| parent | 5481a864cda1d6232e8383d11227e2402df106e3 (diff) | |
update from netbsd tree
Diffstat (limited to 'sys/arch/vax/include')
| -rw-r--r-- | sys/arch/vax/include/macros.h | 5 | ||||
| -rw-r--r-- | sys/arch/vax/include/rpb.h | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/sys/arch/vax/include/macros.h b/sys/arch/vax/include/macros.h index eb2dc2b9fd1..9b1bf44c026 100644 --- a/sys/arch/vax/include/macros.h +++ b/sys/arch/vax/include/macros.h @@ -1,4 +1,4 @@ -/* $NetBSD: macros.h,v 1.4 1995/07/05 08:22:21 ragge Exp $ */ +/* $NetBSD: macros.h,v 1.5 1995/10/20 12:55:06 ragge Exp $ */ /* * Copyright (c) 1994 Ludd, University of Lule}, Sweden. @@ -32,7 +32,8 @@ /* All bugs are subject to removal without further notice */ -#if !defined(_VAX_MACROS_H_)&&!defined(ASSEMBLER)&&defined(_VAX_INLINE_) +#if !defined(_VAX_MACROS_H_) && (defined(STANDALONE) || \ + (!defined(ASSEMBLER) && defined(_VAX_INLINE_))) #define _VAX_MACROS_H_ /* Here general macros are supposed to be stored */ diff --git a/sys/arch/vax/include/rpb.h b/sys/arch/vax/include/rpb.h index de7aec72007..7e5e1f02080 100644 --- a/sys/arch/vax/include/rpb.h +++ b/sys/arch/vax/include/rpb.h @@ -1,4 +1,4 @@ -/* $NetBSD: rpb.h,v 1.1 1995/06/05 17:17:59 ragge Exp $ */ +/* $NetBSD: rpb.h,v 1.2 1995/10/20 13:47:27 ragge Exp $ */ /* * Copyright (c) 1995 Ludd, University of Lule}, Sweden. * All rights reserved. @@ -97,4 +97,6 @@ struct rpb { /* size description */ long vmb_revision; /* 4 VMB revision label */ }; +#ifdef _KERNEL extern struct rpb rpb; +#endif |