From: Derrick Brashear <shadow@dementia.org>
Date: Sat, 21 Mar 2009 15:45:52 +0000 (+0000)
Subject: DEVEL15-rx-prototypes-alloc-free-ifdefs-20090321
X-Git-Tag: openafs-devel-1_5_58~32
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=107aac629927919afc4b4c0d47d92a55cc25e581;p=packages%2Fo%2Fopenafs.git

DEVEL15-rx-prototypes-alloc-free-ifdefs-20090321

LICENSE IPL10

don't prototype osi_Alloc/osi_Free if they're just #defines


(cherry picked from commit 4398d6277dacde8464c0db7a73d5ecb37039823f)
---

diff --git a/src/rx/rx_prototypes.h b/src/rx/rx_prototypes.h
index 5ca81fbdb..89b560042 100644
--- a/src/rx/rx_prototypes.h
+++ b/src/rx/rx_prototypes.h
@@ -605,8 +605,12 @@ extern void rxi_InitPeerParams(struct rx_peer *pp);
 extern int rxi_HandleSocketError(int socket);
 
 #if defined(AFS_AIX32_ENV) && !defined(KERNEL)
+#ifndef osi_Alloc
 extern void *osi_Alloc(afs_int32 x);
+#endif
+#ifndef osi_Free
 extern void osi_Free(void *x, afs_int32 size);
+#endif
 #endif /* defined(AFS_AIX32_ENV) && !defined(KERNEL) */
 
 extern void rx_GetIFInfo(void);