rx: always use/protect the xdr routines in the kernel

[openafs.git] / src / rx / xdr.h

diff --git a/src/rx/xdr.h b/src/rx/xdr.h
index 0ad3e34..04236b1 100644 (file)
--- a/src/rx/xdr.h
+++ b/src/rx/xdr.h
@@ -55,6 +55,13 @@
 #endif /* !TRUE */
 #define __dontcare__   -1
 
+#if defined(AFS_NBSD50_ENV)
+# if !defined(DEF_CADDR_T)
+typedef char * caddr_t;
+#define DEF_CADDR_T
+# endif
+#endif
+
 #ifndef mem_alloc
 #define mem_alloc(bsize)       malloc(bsize)
 #endif
@@ -63,7 +70,7 @@
 #define mem_free(ptr, bsize)   free(ptr)
 #endif
 
-#if defined(AFS_AMD64_LINUX24_ENV) || defined(AFS_DARWIN_ENV)
+#if !defined(AFS_NT40_ENV)
 #define xdr_alloc afs_xdr_alloc
 #define xdr_free afs_xdr_free
 #define xdr_void afs_xdr_void
@@ -101,9 +108,6 @@
 /* keep here for now, 64 bit issues */
 #ifndef AFS_OBSD44_ENV
 extern void *afs_osi_Alloc(size_t x);
-#ifndef afs_osi_Alloc_NoSleep
-extern void *afs_osi_Alloc_NoSleep(size_t x);
-#endif
 extern void afs_osi_Free(void *x, size_t asize);
 #endif