diff options
| author | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1996-03-25 15:56:24 +0000 |
|---|---|---|
| committer | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1996-03-25 15:56:24 +0000 |
| commit | 6967ae698477e809eb79f71e8ee2b9db37c9183a (patch) | |
| tree | 1decc90a7a3407dfdf7cdc3ff4aa11c2aa9ef862 /usr.sbin/amd/config | |
| parent | 22a628436b9c63f1069f0a15af3684d68574d575 (diff) | |
From NetBSD: merge of 960317
Diffstat (limited to 'usr.sbin/amd/config')
| -rw-r--r-- | usr.sbin/amd/config/mtab_bsd.c | 6 | ||||
| -rw-r--r-- | usr.sbin/amd/config/os-bsd44.h | 7 |
2 files changed, 7 insertions, 6 deletions
diff --git a/usr.sbin/amd/config/mtab_bsd.c b/usr.sbin/amd/config/mtab_bsd.c index b1791ee09a1..6d2bb72b8fd 100644 --- a/usr.sbin/amd/config/mtab_bsd.c +++ b/usr.sbin/amd/config/mtab_bsd.c @@ -1,3 +1,5 @@ +/* $OpenBSD: mtab_bsd.c,v 1.2 1996/03/25 15:54:52 niklas Exp $ */ + /* * Copyright (c) 1990 Jan-Simon Pendry * Copyright (c) 1990 Imperial College of Science, Technology & Medicine @@ -36,16 +38,12 @@ * SUCH DAMAGE. * * from: @(#)mtab_bsd.c 8.1 (Berkeley) 6/6/93 - * $Id: mtab_bsd.c,v 1.1 1995/10/18 08:47:14 deraadt Exp $ - * */ #include "am.h" #ifdef READ_MTAB_BSD_STYLE -#include <sys/mount.h> - static struct mntent *mnt_dup(mp) struct statfs *mp; { diff --git a/usr.sbin/amd/config/os-bsd44.h b/usr.sbin/amd/config/os-bsd44.h index e83eef83272..21d4d3ef310 100644 --- a/usr.sbin/amd/config/os-bsd44.h +++ b/usr.sbin/amd/config/os-bsd44.h @@ -1,3 +1,5 @@ +/* $OpenBSD: os-bsd44.h,v 1.4 1996/03/25 15:54:53 niklas Exp $ */ + /* * Copyright (c) 1990 Jan-Simon Pendry * Copyright (c) 1990 Imperial College of Science, Technology & Medicine @@ -36,7 +38,6 @@ * SUCH DAMAGE. * * from: @(#)os-bsd44.h 8.1 (Berkeley) 6/6/93 - * $Id: os-bsd44.h,v 1.3 1996/02/17 02:55:22 dm Exp $ * * 4.4 BSD definitions for Amd (automounter) */ @@ -177,7 +178,9 @@ struct mntent { * Type of a file handle */ #undef NFS_FH_TYPE -#define NFS_FH_TYPE nfsv2fh_t * +#if __NetBSD__ +#define NFS_FH_TYPE void * +#endif /* * How to get a mount list |