summaryrefslogtreecommitdiffstats
path: root/contrib
diff options
context:
space:
mode:
authorobrien <obrien@FreeBSD.org>2001-09-02 19:35:47 +0000
committerobrien <obrien@FreeBSD.org>2001-09-02 19:35:47 +0000
commitaedd0d9804864b322c416929f0f9706ecadee6a8 (patch)
tree7e43a0eaa5219b23389fff0217d12b9a15c478f3 /contrib
parent8737b3a711fa4994a6a4720d4d0eea4b2b851bb9 (diff)
downloadFreeBSD-src-aedd0d9804864b322c416929f0f9706ecadee6a8.zip
FreeBSD-src-aedd0d9804864b322c416929f0f9706ecadee6a8.tar.gz
Reduce diff from vendor source.
Diffstat (limited to 'contrib')
-rw-r--r--contrib/amd/include/am_defs.h13
1 files changed, 6 insertions, 7 deletions
diff --git a/contrib/amd/include/am_defs.h b/contrib/amd/include/am_defs.h
index f53187a..28a6307 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>.
OpenPOWER on IntegriCloud