diff options
Diffstat (limited to 'contrib/amd')
| -rw-r--r-- | contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h | 11 | ||||
| -rw-r--r-- | contrib/amd/include/am_defs.h | 3 |
2 files changed, 5 insertions, 9 deletions
diff --git a/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h b/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h index 6ebf490..a2678c7 100644 --- a/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h +++ b/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h @@ -46,11 +46,6 @@ #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 */ /* nfs_prot.h defines struct `nfs_fh3', but it is a ``dmr "unwarranted * chumminess with the C implementation". We need the more complete * structure, which is defined below. So get the stock `nfs_fh3' @@ -58,7 +53,11 @@ */ struct nfs_fh3; #define nfs_fh3 nfs_fh3_fbsd_ -# include "nfs_prot.h" + +#ifdef HAVE_RPCSVC_NFS_PROT_H +# include <rpcsvc/nfs_prot.h> +#endif /* HAVE_RPCSVC_NFS_PROT_H */ + #undef nfs_fh3 #ifdef HAVE_NFS_RPCV2_H diff --git a/contrib/amd/include/am_defs.h b/contrib/amd/include/am_defs.h index 28a6307..c42afe0 100644 --- a/contrib/amd/include/am_defs.h +++ b/contrib/amd/include/am_defs.h @@ -914,14 +914,11 @@ struct sockaddr_dl; * AIX does not protect against this file doubly included, * so I have to do my own protection here. */ -#ifdef COMMENT_OUT #ifdef HAVE_RPCSVC_MOUNT_H # ifndef _RPCSVC_MOUNT_H # include <rpcsvc/mount.h> # endif /* not _RPCSVC_MOUNT_H */ #endif /* HAVE_RPCSVC_MOUNT_H */ -#endif -# include "mount.h" /* * Actions to take if <rpcsvc/nis.h> exists. |
