From: Andrew Deason <adeason@sinenomine.net>
Date: Mon, 6 Dec 2010 20:27:22 +0000 (-0600)
Subject: RX: Always define kernel XDR symbols to be AFS XDR
X-Git-Tag: upstream/1.8.0_pre1^2~4387
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=ac1c4b30ba25ce49fdd18f37399a1194d934ab8e;p=packages%2Fo%2Fopenafs.git

RX: Always define kernel XDR symbols to be AFS XDR

Always define xdr_foo to afs_xdr_foo when we're in the kernel.
Otherwise, we can get warnings that our xdr_foo symbols are colliding
with the xdr_foo symbols from the kernel.

Change-Id: I74b2cdd24f01734c2c36506bb5bab0b386d46094
Reviewed-on: http://gerrit.openafs.org/3465
Tested-by: Andrew Deason <adeason@sinenomine.net>
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
---

diff --git a/src/rx/xdr.h b/src/rx/xdr.h
index 82dbe5254..056cc1f92 100644
--- a/src/rx/xdr.h
+++ b/src/rx/xdr.h
@@ -70,7 +70,7 @@ typedef char * caddr_t;
 #define mem_free(ptr, bsize)	free(ptr)
 #endif
 
-#if defined(AFS_AMD64_LINUX24_ENV) || defined(AFS_DARWIN_ENV)
+#if defined(AFS_AMD64_LINUX24_ENV) || defined(AFS_DARWIN_ENV) || (defined(KERNEL) && !defined(UKERNEL))
 #define xdr_alloc afs_xdr_alloc
 #define xdr_free afs_xdr_free
 #define xdr_void afs_xdr_void