summaryrefslogtreecommitdiffstats
path: root/contrib/amd/conf/nfs_prot
diff options
context:
space:
mode:
authormbr <mbr@FreeBSD.org>2003-09-02 15:42:57 +0000
committermbr <mbr@FreeBSD.org>2003-09-02 15:42:57 +0000
commitfa2df21e0559a4a9af7f4504ac75a0ff043eaeb9 (patch)
tree361063e0f962fb2fd69f626b26e596899c16d3cd /contrib/amd/conf/nfs_prot
parentccc3812476e334ade5336aa157187088e2026fd3 (diff)
downloadFreeBSD-src-fa2df21e0559a4a9af7f4504ac75a0ff043eaeb9.zip
FreeBSD-src-fa2df21e0559a4a9af7f4504ac75a0ff043eaeb9.tar.gz
Resolve conflicts.
Diffstat (limited to 'contrib/amd/conf/nfs_prot')
-rw-r--r--contrib/amd/conf/nfs_prot/nfs_prot_freebsd2.h4
-rw-r--r--contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h12
2 files changed, 11 insertions, 5 deletions
diff --git a/contrib/amd/conf/nfs_prot/nfs_prot_freebsd2.h b/contrib/amd/conf/nfs_prot/nfs_prot_freebsd2.h
index 252da9b..b0a66c3 100644
--- a/contrib/amd/conf/nfs_prot/nfs_prot_freebsd2.h
+++ b/contrib/amd/conf/nfs_prot/nfs_prot_freebsd2.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997-2001 Erez Zadok
+ * Copyright (c) 1997-2003 Erez Zadok
* Copyright (c) 1990 Jan-Simon Pendry
* Copyright (c) 1990 Imperial College of Science, Technology & Medicine
* Copyright (c) 1990 The Regents of the University of California.
@@ -38,7 +38,7 @@
*
* %W% (Berkeley) %G%
*
- * $Id: nfs_prot_freebsd2.h,v 1.3.2.1 2001/01/10 03:23:21 ezk Exp $
+ * $Id: nfs_prot_freebsd2.h,v 1.3.2.3 2002/12/27 22:44:54 ezk Exp $
* $FreeBSD$
*
*/
diff --git a/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h b/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h
index 6ea5c45..c392497 100644
--- a/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h
+++ b/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997-2001 Erez Zadok
+ * Copyright (c) 1997-2003 Erez Zadok
* Copyright (c) 1990 Jan-Simon Pendry
* Copyright (c) 1990 Imperial College of Science, Technology & Medicine
* Copyright (c) 1990 The Regents of the University of California.
@@ -38,7 +38,7 @@
*
* %W% (Berkeley) %G%
*
- * $Id: nfs_prot_freebsd3.h,v 1.5.2.1 2001/01/10 03:23:22 ezk Exp $
+ * $Id: nfs_prot_freebsd3.h,v 1.5.2.6 2003/08/27 19:35:16 ib42 Exp $
* $FreeBSD$
*
*/
@@ -71,6 +71,11 @@ struct nfs_fh3;
# include <ufs/ufs/ufsmount.h>
#endif /* HAVE_UFS_UFS_UFSMOUNT_H */
+/* nfsclient/nfsargs.h was introduced in FreeBSD 5.0, and is needed */
+#ifdef HAVE_NFSCLIENT_NFSARGS_H
+# include <nfsclient/nfsargs.h>
+#endif /* HAVE_NFSCLIENT_NFSARGS_H */
+
/*
* MACROS:
*/
@@ -96,6 +101,7 @@ struct nfs_fh3;
#define na_nlink nlink
#define na_size size
#define na_type type
+#define na_uid uid
#define ne_cookie cookie
#define ne_fileid fileid
#define ne_name name
@@ -176,7 +182,7 @@ typedef writeargs nfswriteargs;
/*
* as of 3.0-RELEASE the nfs_fh3 that is defined in the system headers
* (or the one generated by rpcgen) lacks the proper full definition,
- * listed below. A special macro (aux/macros/struct_nfs_fh3.m4) searches
+ * listed below. A special macro (m4/macros/struct_nfs_fh3.m4) searches
* for this special name before other names.
*/
struct nfs_fh3_freebsd3 {
OpenPOWER on IntegriCloud