diff options
| -rw-r--r-- | contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h | 12 | ||||
| -rw-r--r-- | usr.sbin/amd/Makefile.inc | 8 | ||||
| -rw-r--r-- | usr.sbin/amd/libamu/Makefile | 2 |
3 files changed, 15 insertions, 7 deletions
diff --git a/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h b/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h index a9acf5b..0c319d3 100644 --- a/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h +++ b/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h @@ -38,7 +38,7 @@ * * %W% (Berkeley) %G% * - * $Id: nfs_prot_freebsd3.h,v 1.1.1.1 1998/08/23 22:07:20 obrien Exp $ + * $Id: nfs_prot_freebsd3.h,v 1.2 1998/08/27 07:33:23 obrien Exp $ * */ @@ -50,7 +50,15 @@ # 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' + * out of the way. + */ +struct nfs_fh3; +#define nfs_fh3 nfs_fh3_fbsd_ # include "nfs_prot.h" +#undef nfs_fh3 #ifdef HAVE_NFS_RPCV2_H # include <nfs/rpcv2.h> @@ -160,10 +168,10 @@ typedef writeargs nfswriteargs; #ifdef COMMENT_OUT #define FHSIZE3 64 /* size in bytes of a file handle (v3) */ -#endif /* COMMENT_OUT */ #define NFS3_FHSIZE 64 #define MOUNTVERS3 ((unsigned long)(3)) #define NFS_V3 ((unsigned long)(3)) +#endif /* COMMENT_OUT */ #ifdef COMMENT_OUT typedef struct { diff --git a/usr.sbin/amd/Makefile.inc b/usr.sbin/amd/Makefile.inc index 7856fd2..eceebcd 100644 --- a/usr.sbin/amd/Makefile.inc +++ b/usr.sbin/amd/Makefile.inc @@ -1,6 +1,6 @@ # ex:ts=8 # -# $Id: Makefile.inc,v 1.1 1998/08/27 08:09:38 obrien Exp $ +# $Id: Makefile.inc,v 1.2 1998/08/30 19:59:35 gpalmer Exp $ # # Makefile for amd # This file is under a "BSD" copyright (c) by David O'Brien 1998. @@ -11,7 +11,7 @@ # #INCGEN!= cd ${.CURDIR}/../include; \ -# printf 'xwhere: .MAKE\n\t@echo \$${.OBJDIR}\n' | ${MAKE} -s -f- +# printf 'xwhere: .MAKE\n\t@echo \$${.OBJDIR}\n' | ${MAKE} -Bs -f- #CFLAGS+= -I${INCGEN} CFLAGS+= -I. -I${.CURDIR} @@ -40,10 +40,10 @@ SRCS+= mount.h nfs_prot.h CLEANFILES+= mount.h nfs_prot.h mount.h: ${MOUNT_X} - ${RPCCOM} -h -DWANT_NFS3 ${MOUNT_X} -o ${.TARGET} + ${RPCCOM} -h -C -DWANT_NFS3 ${MOUNT_X} -o ${.TARGET} nfs_prot.h: ${NFS_PROT_X} - ${RPCCOM} -h ${NFS_PROT_X} -o ${.TARGET} + ${RPCCOM} -h -C -DWANT_NFS3 ${NFS_PROT_X} -o ${.TARGET} .if exists(${.CURDIR}/../../Makefile.inc) diff --git a/usr.sbin/amd/libamu/Makefile b/usr.sbin/amd/libamu/Makefile index 32f3e68..d2f2699 100644 --- a/usr.sbin/amd/libamu/Makefile +++ b/usr.sbin/amd/libamu/Makefile @@ -27,7 +27,7 @@ SRCS+= nfs_prot_x.c CLEANFILES+= nfs_prot_x.c nfs_prot_x.c: ${NFS_PROT_X} - ${RPCCOM} -c ${NFS_PROT_X} -o ${.TARGET} + ${RPCCOM} -c -DWANT_NFS3 ${NFS_PROT_X} -o ${.TARGET} install: |
