diff options
| author | obrien <obrien@FreeBSD.org> | 1998-09-09 16:11:01 +0000 |
|---|---|---|
| committer | obrien <obrien@FreeBSD.org> | 1998-09-09 16:11:01 +0000 |
| commit | 05172643a8eaa19dac2c2a8d62298f4ccb5615f5 (patch) | |
| tree | 734aae78692dcf81f1e2119e60692624b334db8e /contrib/amd/conf | |
| parent | 9880fc9dc798767b37ac48551a592f7991a3dc2d (diff) | |
| download | FreeBSD-src-05172643a8eaa19dac2c2a8d62298f4ccb5615f5.zip FreeBSD-src-05172643a8eaa19dac2c2a8d62298f4ccb5615f5.tar.gz | |
Fully use our own generated files for NFSv3.
Diffstat (limited to 'contrib/amd/conf')
| -rw-r--r-- | contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h b/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h index a9acf5b..0c319d3 100644 --- a/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h +++ b/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h @@ -38,7 +38,7 @@ * * %W% (Berkeley) %G% * - * $Id: nfs_prot_freebsd3.h,v 1.1.1.1 1998/08/23 22:07:20 obrien Exp $ + * $Id: nfs_prot_freebsd3.h,v 1.2 1998/08/27 07:33:23 obrien Exp $ * */ @@ -50,7 +50,15 @@ # include <rpcsvc/nfs_prot.h> #endif /* HAVE_RPCSVC_NFS_PROT_H */ #endif /* COMMENT_OUT */ +/* nfs_prot.h defines struct `nfs_fh3', but it is a ``dmr "unwarranted + * chumminess with the C implementation". We need the more complete + * structure, which is defined below. So get the stock `nfs_fh3' + * out of the way. + */ +struct nfs_fh3; +#define nfs_fh3 nfs_fh3_fbsd_ # include "nfs_prot.h" +#undef nfs_fh3 #ifdef HAVE_NFS_RPCV2_H # include <nfs/rpcv2.h> @@ -160,10 +168,10 @@ typedef writeargs nfswriteargs; #ifdef COMMENT_OUT #define FHSIZE3 64 /* size in bytes of a file handle (v3) */ -#endif /* COMMENT_OUT */ #define NFS3_FHSIZE 64 #define MOUNTVERS3 ((unsigned long)(3)) #define NFS_V3 ((unsigned long)(3)) +#endif /* COMMENT_OUT */ #ifdef COMMENT_OUT typedef struct { |
