From 56786ee91bd09bba47ab2ee982cc297da9d26980 Mon Sep 17 00:00:00 2001 From: John-Mark Gurney Date: Tue, 30 Jun 1998 11:19:22 +0000 Subject: [PATCH] fix buildworld hopefully be3fore anyone complains... NFS_*TIMO should possibly be converted to sysctl vars (jkh's suggestion), but in some cases it looks like nfs keeps a copy of the value in a struct hash sizes are already ifdef'd KERNEL, so there aren't userland inpact from them... --- lkm/nfs/Makefile | 4 +++- sys/modules/nfs/Makefile | 4 +++- sys/modules/nfsclient/Makefile | 4 +++- sys/modules/nfsserver/Makefile | 4 +++- sys/nfs/nfs.h | 4 +++- sys/nfsclient/nfs.h | 4 +++- sys/nfsclient/nfsargs.h | 4 +++- sys/nfsclient/nfsstats.h | 4 +++- sys/nfsserver/nfs.h | 4 +++- sys/nfsserver/nfsrvstats.h | 4 +++- 10 files changed, 30 insertions(+), 10 deletions(-) diff --git a/lkm/nfs/Makefile b/lkm/nfs/Makefile index 4c43b119cd37..991b84808f62 100644 --- a/lkm/nfs/Makefile +++ b/lkm/nfs/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.5 1998/02/04 21:56:37 eivind Exp $ +# $Id: Makefile,v 1.6 1998/02/06 23:54:23 eivind Exp $ .PATH: ${.CURDIR}/../../sys/nfs KMOD= nfs_mod @@ -17,5 +17,7 @@ opt_inet.h: .if ${NFS_INET} > 0 echo "#define INET 1" > opt_inet.h .endif +opt_nfs.h: + touch opt_nfs.h .include diff --git a/sys/modules/nfs/Makefile b/sys/modules/nfs/Makefile index 4c43b119cd37..991b84808f62 100644 --- a/sys/modules/nfs/Makefile +++ b/sys/modules/nfs/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.5 1998/02/04 21:56:37 eivind Exp $ +# $Id: Makefile,v 1.6 1998/02/06 23:54:23 eivind Exp $ .PATH: ${.CURDIR}/../../sys/nfs KMOD= nfs_mod @@ -17,5 +17,7 @@ opt_inet.h: .if ${NFS_INET} > 0 echo "#define INET 1" > opt_inet.h .endif +opt_nfs.h: + touch opt_nfs.h .include diff --git a/sys/modules/nfsclient/Makefile b/sys/modules/nfsclient/Makefile index 4c43b119cd37..991b84808f62 100644 --- a/sys/modules/nfsclient/Makefile +++ b/sys/modules/nfsclient/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.5 1998/02/04 21:56:37 eivind Exp $ +# $Id: Makefile,v 1.6 1998/02/06 23:54:23 eivind Exp $ .PATH: ${.CURDIR}/../../sys/nfs KMOD= nfs_mod @@ -17,5 +17,7 @@ opt_inet.h: .if ${NFS_INET} > 0 echo "#define INET 1" > opt_inet.h .endif +opt_nfs.h: + touch opt_nfs.h .include diff --git a/sys/modules/nfsserver/Makefile b/sys/modules/nfsserver/Makefile index 4c43b119cd37..991b84808f62 100644 --- a/sys/modules/nfsserver/Makefile +++ b/sys/modules/nfsserver/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.5 1998/02/04 21:56:37 eivind Exp $ +# $Id: Makefile,v 1.6 1998/02/06 23:54:23 eivind Exp $ .PATH: ${.CURDIR}/../../sys/nfs KMOD= nfs_mod @@ -17,5 +17,7 @@ opt_inet.h: .if ${NFS_INET} > 0 echo "#define INET 1" > opt_inet.h .endif +opt_nfs.h: + touch opt_nfs.h .include diff --git a/sys/nfs/nfs.h b/sys/nfs/nfs.h index f4c6dc126a69..e5be581fa031 100644 --- a/sys/nfs/nfs.h +++ b/sys/nfs/nfs.h @@ -34,13 +34,15 @@ * SUCH DAMAGE. * * @(#)nfs.h 8.4 (Berkeley) 5/1/95 - * $Id: nfs.h,v 1.40 1998/05/31 20:08:51 peter Exp $ + * $Id: nfs.h,v 1.41 1998/06/30 03:01:37 jmg Exp $ */ #ifndef _NFS_NFS_H_ #define _NFS_NFS_H_ +#ifdef KERNEL #include "opt_nfs.h" +#endif /* * Tunable constants for nfs diff --git a/sys/nfsclient/nfs.h b/sys/nfsclient/nfs.h index f4c6dc126a69..e5be581fa031 100644 --- a/sys/nfsclient/nfs.h +++ b/sys/nfsclient/nfs.h @@ -34,13 +34,15 @@ * SUCH DAMAGE. * * @(#)nfs.h 8.4 (Berkeley) 5/1/95 - * $Id: nfs.h,v 1.40 1998/05/31 20:08:51 peter Exp $ + * $Id: nfs.h,v 1.41 1998/06/30 03:01:37 jmg Exp $ */ #ifndef _NFS_NFS_H_ #define _NFS_NFS_H_ +#ifdef KERNEL #include "opt_nfs.h" +#endif /* * Tunable constants for nfs diff --git a/sys/nfsclient/nfsargs.h b/sys/nfsclient/nfsargs.h index f4c6dc126a69..e5be581fa031 100644 --- a/sys/nfsclient/nfsargs.h +++ b/sys/nfsclient/nfsargs.h @@ -34,13 +34,15 @@ * SUCH DAMAGE. * * @(#)nfs.h 8.4 (Berkeley) 5/1/95 - * $Id: nfs.h,v 1.40 1998/05/31 20:08:51 peter Exp $ + * $Id: nfs.h,v 1.41 1998/06/30 03:01:37 jmg Exp $ */ #ifndef _NFS_NFS_H_ #define _NFS_NFS_H_ +#ifdef KERNEL #include "opt_nfs.h" +#endif /* * Tunable constants for nfs diff --git a/sys/nfsclient/nfsstats.h b/sys/nfsclient/nfsstats.h index f4c6dc126a69..e5be581fa031 100644 --- a/sys/nfsclient/nfsstats.h +++ b/sys/nfsclient/nfsstats.h @@ -34,13 +34,15 @@ * SUCH DAMAGE. * * @(#)nfs.h 8.4 (Berkeley) 5/1/95 - * $Id: nfs.h,v 1.40 1998/05/31 20:08:51 peter Exp $ + * $Id: nfs.h,v 1.41 1998/06/30 03:01:37 jmg Exp $ */ #ifndef _NFS_NFS_H_ #define _NFS_NFS_H_ +#ifdef KERNEL #include "opt_nfs.h" +#endif /* * Tunable constants for nfs diff --git a/sys/nfsserver/nfs.h b/sys/nfsserver/nfs.h index f4c6dc126a69..e5be581fa031 100644 --- a/sys/nfsserver/nfs.h +++ b/sys/nfsserver/nfs.h @@ -34,13 +34,15 @@ * SUCH DAMAGE. * * @(#)nfs.h 8.4 (Berkeley) 5/1/95 - * $Id: nfs.h,v 1.40 1998/05/31 20:08:51 peter Exp $ + * $Id: nfs.h,v 1.41 1998/06/30 03:01:37 jmg Exp $ */ #ifndef _NFS_NFS_H_ #define _NFS_NFS_H_ +#ifdef KERNEL #include "opt_nfs.h" +#endif /* * Tunable constants for nfs diff --git a/sys/nfsserver/nfsrvstats.h b/sys/nfsserver/nfsrvstats.h index f4c6dc126a69..e5be581fa031 100644 --- a/sys/nfsserver/nfsrvstats.h +++ b/sys/nfsserver/nfsrvstats.h @@ -34,13 +34,15 @@ * SUCH DAMAGE. * * @(#)nfs.h 8.4 (Berkeley) 5/1/95 - * $Id: nfs.h,v 1.40 1998/05/31 20:08:51 peter Exp $ + * $Id: nfs.h,v 1.41 1998/06/30 03:01:37 jmg Exp $ */ #ifndef _NFS_NFS_H_ #define _NFS_NFS_H_ +#ifdef KERNEL #include "opt_nfs.h" +#endif /* * Tunable constants for nfs