From 7d1e2a75fdb54f9ec4b062fc8f0aad94d4f3c667 Mon Sep 17 00:00:00 2001 From: Derrick Brashear Date: Fri, 26 Jul 2002 21:56:32 +0000 Subject: [PATCH] STABLE12-solaris-nfs-module-updates-20020726 make it compile again (cherry picked from commit 094adf6b12f3461a7f0ea4ec0a9f268c0c50336b) --- src/afs/afs_nfsdisp.c | 2 ++ src/libafs/Makefile.common | 3 --- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/afs/afs_nfsdisp.c b/src/afs/afs_nfsdisp.c index 801cc9bd8..376272229 100644 --- a/src/afs/afs_nfsdisp.c +++ b/src/afs/afs_nfsdisp.c @@ -12,6 +12,8 @@ RCSID("$Header$"); +/* Ugly Ugly Ugly but precludes conflicting XDR macros; We want kernel xdr */ +#define __XDR_INCLUDE__ #include "../afs/stds.h" #include "../afs/sysincludes.h" /* Standard vendor system headers */ #if defined(AFS_SUN55_ENV) && !defined(AFS_NONFSTRANS) diff --git a/src/libafs/Makefile.common b/src/libafs/Makefile.common index d3c68d1cc..73a84c64d 100644 --- a/src/libafs/Makefile.common +++ b/src/libafs/Makefile.common @@ -127,7 +127,6 @@ AFSAOBJS = \ AFSNFSOBJS = \ afs_nfsclnt.o \ afs_nfsdisp.o \ - afs_nfsdisp_v3.o \ afs_call_nfs.o \ afs_pioctl_nfs.o \ $(AFS_OS_NFSOBJS) @@ -262,8 +261,6 @@ afs_nfsclnt.o: $(AFS)/afs_nfsclnt.c $(CRULE1); afs_nfsdisp.o: $(AFS)/afs_nfsdisp.c $(CRULE1); -afs_nfsdisp_v3.o: $(AFS)/afs_nfsdisp_v3.c - $(CRULE1); rx.o: $(RX)/rx.c $(CRULE1); rx_clock.o: $(RX)/rx_clock.c -- 2.39.5