diff options
| author | David E. O'Brien <obrien@FreeBSD.org> | 2001-09-02 19:35:47 +0000 |
|---|---|---|
| committer | David E. O'Brien <obrien@FreeBSD.org> | 2001-09-02 19:35:47 +0000 |
| commit | 7fa5ad1d30e0632b4a3a5e04472622df34223eb4 (patch) | |
| tree | 7e43a0eaa5219b23389fff0217d12b9a15c478f3 /contrib/amd | |
| parent | 187b9bd7666d2ae11ff2bed4b675371ddc5199be (diff) | |
| download | src-7fa5ad1d30e0632b4a3a5e04472622df34223eb4.tar.gz src-7fa5ad1d30e0632b4a3a5e04472622df34223eb4.zip | |
Reduce diff from vendor source.
Notes
Notes:
svn path=/head/; revision=82815
Diffstat (limited to 'contrib/amd')
| -rw-r--r-- | contrib/amd/include/am_defs.h | 13 |
1 files 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>. |