From 95469232de2431c2ea73f7788417474d48fc0ba9 Mon Sep 17 00:00:00 2001 From: obrien Date: Thu, 27 Aug 1998 07:33:23 +0000 Subject: [PATCH] rpcgen our own mount.h, nfs_prot.h, mount_xdr.c, and nfs_prot_x.c for NFSv3 support --- contrib/amd/conf/nfs_prot/nfs_prot_freebsd2.h | 5 ++++- contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h | 10 +++++++++- contrib/amd/include/am_defs.h | 5 ++++- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/contrib/amd/conf/nfs_prot/nfs_prot_freebsd2.h b/contrib/amd/conf/nfs_prot/nfs_prot_freebsd2.h index e55e1145b28a..e39ff1b711c5 100644 --- a/contrib/amd/conf/nfs_prot/nfs_prot_freebsd2.h +++ b/contrib/amd/conf/nfs_prot/nfs_prot_freebsd2.h @@ -38,16 +38,19 @@ * * %W% (Berkeley) %G% * - * $Id: nfs_prot_freebsd2.h,v 1.1 1996/01/13 23:23:39 ezk Exp ezk $ + * $Id: nfs_prot_freebsd2.h,v 1.1.1.1 1998/08/23 22:07:20 obrien Exp $ * */ #ifndef _AMU_NFS_PROT_H #define _AMU_NFS_PROT_H +#ifdef COMMENT_OUT #ifdef HAVE_RPCSVC_NFS_PROT_H # include #endif /* HAVE_RPCSVC_NFS_PROT_H */ +#endif /* COMMENT_OUT */ +# include "nfs_prot.h" /* * MACROS: diff --git a/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h b/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h index 915f01411a5c..a9acf5b97e09 100644 --- a/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h +++ b/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h @@ -38,16 +38,20 @@ * * %W% (Berkeley) %G% * - * $Id: nfs_prot_freebsd3.h,v 1.1 1996/01/13 23:23:39 ezk Exp ezk $ + * $Id: nfs_prot_freebsd3.h,v 1.1.1.1 1998/08/23 22:07:20 obrien Exp $ * */ #ifndef _AMU_NFS_PROT_H #define _AMU_NFS_PROT_H +#ifdef COMMENT_OUT #ifdef HAVE_RPCSVC_NFS_PROT_H # include #endif /* HAVE_RPCSVC_NFS_PROT_H */ +#endif /* COMMENT_OUT */ +# include "nfs_prot.h" + #ifdef HAVE_NFS_RPCV2_H # include #endif /* HAVE_NFS_RPCV2_H */ @@ -154,11 +158,14 @@ typedef writeargs nfswriteargs; # define MOUNT_NFS3 MOUNT_NFS # define MNTOPT_NFS3 "nfs" +#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)) +#ifdef COMMENT_OUT typedef struct { u_int fhandle3_len; char *fhandle3_val; @@ -194,6 +201,7 @@ struct mountres3 { } mountres3_u; }; typedef struct mountres3 mountres3; +#endif /* COMMENT_OUT */ struct nfs_fh3 { u_int fh3_length; diff --git a/contrib/amd/include/am_defs.h b/contrib/amd/include/am_defs.h index 690d03305091..b7d36c2f580f 100644 --- a/contrib/amd/include/am_defs.h +++ b/contrib/amd/include/am_defs.h @@ -38,7 +38,7 @@ * * %W% (Berkeley) %G% * - * $Id: am_defs.h,v 1.1 1996/01/13 23:23:39 ezk Exp ezk $ + * $Id: am_defs.h,v 1.1.1.1 1998/08/23 22:07:20 obrien Exp $ * */ @@ -800,11 +800,14 @@ extern int errno; * AIX does not protect against this file doubly included, * so I have to do my own protection here. */ +#ifdef COMMENT_OUT #ifdef HAVE_RPCSVC_MOUNT_H # ifndef _RPCSVC_MOUNT_H # include # endif /* not _RPCSVC_MOUNT_H */ #endif /* HAVE_RPCSVC_MOUNT_H */ +#endif +# include "mount.h" /* * Actions to take if exists.