summaryrefslogtreecommitdiffstats
path: root/contrib
diff options
context:
space:
mode:
authorobrien <obrien@FreeBSD.org>2001-09-02 18:26:32 +0000
committerobrien <obrien@FreeBSD.org>2001-09-02 18:26:32 +0000
commit54cdac569ea2093ba561208f695cfd0fe5a2a4c8 (patch)
tree5b77b5c36830efbc4ba2ff8074165aed21a9c597 /contrib
parente4ce73cbb673b27ac3aa866edae1778c905bc07c (diff)
downloadFreeBSD-src-54cdac569ea2093ba561208f695cfd0fe5a2a4c8.zip
FreeBSD-src-54cdac569ea2093ba561208f695cfd0fe5a2a4c8.tar.gz
We are returning to the stock (6.0.7) file now.
I don't recall why the rev 1.2 hack is needed. It looks like Amd was already using our local headers. I no longer have a FreeBSD 2.x box to test this on, and this will never be MFC'ed to RELENG_2_2. So lets just decrease the maintenance effort.
Diffstat (limited to 'contrib')
-rw-r--r--contrib/amd/conf/nfs_prot/nfs_prot_freebsd2.h7
1 files changed, 2 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 e719e99..252da9b 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-1999 Erez Zadok
+ * Copyright (c) 1997-2001 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.2 1999/01/10 21:54:14 ezk Exp $
+ * $Id: nfs_prot_freebsd2.h,v 1.3.2.1 2001/01/10 03:23:21 ezk Exp $
* $FreeBSD$
*
*/
@@ -46,12 +46,9 @@
#ifndef _AMU_NFS_PROT_H
#define _AMU_NFS_PROT_H
-#ifdef COMMENT_OUT
#ifdef HAVE_RPCSVC_NFS_PROT_H
# include <rpcsvc/nfs_prot.h>
#endif /* HAVE_RPCSVC_NFS_PROT_H */
-#endif /* COMMENT_OUT */
-# include "nfs_prot.h"
/*
* MACROS:
OpenPOWER on IntegriCloud