From 7fa5ad1d30e0632b4a3a5e04472622df34223eb4 Mon Sep 17 00:00:00 2001
From: "David E. O'Brien" <obrien@FreeBSD.org>
Date: Sun, 2 Sep 2001 19:35:47 +0000
Subject: [PATCH] Reduce diff from vendor source.

---
 contrib/amd/include/am_defs.h | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/contrib/amd/include/am_defs.h b/contrib/amd/include/am_defs.h
index f53187a6c054..28a63077b909 100644
--- a/contrib/amd/include/am_defs.h
+++ b/contrib/amd/include/am_defs.h
@@ -787,10 +787,12 @@ struct sockaddr_dl;
 #ifdef HAVE_SYS_FS_UFS_MOUNT_H
 # include <sys/fs/ufs_mount.h>
 #endif /* HAVE_SYS_FS_UFS_MOUNT_H */
-#ifdef	HAVE_UFS_UFS_UFSMOUNT_H_off
-# error do not include this file here because on netbsd/openbsd it
-# error causes errors with other header files.  Instead, add it to the
-# error specific conf/nfs_prot_*.h file.
+/* 
+ * HAVE_UFS_UFS_UFSMOUNT_H should NOT be defined on netbsd/openbsd because it
+ * causes errors with other header files.  Instead, add it to the specific
+ * conf/nfs_prot_*.h file.
+ */
+#ifdef	HAVE_UFS_UFS_UFSMOUNT_H
 # include <ufs/ufs/ufsmount.h>
 #endif	/* HAVE_UFS_UFS_UFSMOUNT_H */
 
@@ -1148,9 +1150,6 @@ extern char *nc_sperror(void);
 #ifdef HAVE_UFS_UFS_MOUNT_H
 # include <ufs/ufs_mount.h>
 #endif /* HAVE_UFS_UFS_MOUNT_H */
-#ifdef HAVE_UFS_UFS_UFSMOUNT_H
-# include <ufs/ufs/ufsmount.h>
-#endif /* HAVE_UFS_UFS_UFSMOUNT_H */
 
 /*
  * Are S_ISDIR, S_ISREG, et al broken?  If not, include <sys/stat.h>.