From def59db27bb8a6b2b123547b30054d8ff380366e Mon Sep 17 00:00:00 2001 From: Derrick Brashear Date: Fri, 27 Jun 2003 15:07:47 +0000 Subject: [PATCH] rx-xdr-rename-userland-symbols-also-on-amd64-linux-20030627 because the XDR struct is different on amd64, we need to do this to avoid tainting namespace of processes which otherwise use XDR and wouldn't use ours otherwise. this should be done otherwise, or maybe we *should* use the vendor XDR when we can. --- src/rx/xdr.h | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/src/rx/xdr.h b/src/rx/xdr.h index 813d48883..03839aa9e 100644 --- a/src/rx/xdr.h +++ b/src/rx/xdr.h @@ -63,16 +63,7 @@ #define mem_free(ptr, bsize) free(ptr) #endif -#ifdef KERNEL -#define osi_alloc afs_osi_Alloc -#define osi_free afs_osi_Free - -/* keep here for now, 64 bit issues */ -extern void *afs_osi_Alloc(size_t x); -extern void *afs_osi_Alloc_NoSleep(size_t x); -extern void afs_osi_Free(void *x, size_t asize); - -#ifndef UKERNEL +#if defined(AFS_AMD64_LINUX24_ENV) || (defined(KERNEL) && !defined(UKERNEL)) #define xdr_void afs_xdr_void #define xdr_int afs_xdr_int #define xdr_u_int afs_xdr_u_int @@ -98,6 +89,16 @@ extern void afs_osi_Free(void *x, size_t asize); #define xdr_int64 afs_xdr_int64 #define xdr_uint64 afs_xdr_uint64 #endif + +#ifdef KERNEL +#define osi_alloc afs_osi_Alloc +#define osi_free afs_osi_Free + +/* keep here for now, 64 bit issues */ +extern void *afs_osi_Alloc(size_t x); +extern void *afs_osi_Alloc_NoSleep(size_t x); +extern void afs_osi_Free(void *x, size_t asize); + #endif #ifndef major /* ouch! */ #include -- 2.39.5