STABLE12-solaris-nfs-module-updates-20020726

make it compile again

(cherry picked from commit 094adf6b12f3461a7f0ea4ec0a9f268c0c50336b)

diff --git a/src/afs/afs_nfsdisp.c b/src/afs/afs_nfsdisp.c
index 801cc9bd82ce514bbab227581b4cfae2ed39739f..376272229398f3e7fb0e388bc4a83276b16ed974 100644 (file)
--- 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 d3c68d1cca781f9fc1c5f989d7d6c71c6d68c09a..73a84c64dd320a035b8ce1b5d6f8d9815b75ee0c 100644 (file)
--- 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