From 54cdac569ea2093ba561208f695cfd0fe5a2a4c8 Mon Sep 17 00:00:00 2001 From: obrien Date: Sun, 2 Sep 2001 18:26:32 +0000 Subject: [PATCH] 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. --- contrib/amd/conf/nfs_prot/nfs_prot_freebsd2.h | 7 ++----- 1 file 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 e719e9985cd4..252da9ba24b1 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 #endif /* HAVE_RPCSVC_NFS_PROT_H */ -#endif /* COMMENT_OUT */ -# include "nfs_prot.h" /* * MACROS: