From: Derrick Brashear <shadow@dementia.org>
Date: Sat, 21 Mar 2009 15:46:07 +0000 (+0000)
Subject: STABLE14-rx-prototypes-alloc-free-ifdefs-20090321
X-Git-Tag: openafs-stable-1_4_9pre1~7
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=f5372f513743614d2a8eb3f48f222471dcdba2ea;p=packages%2Fo%2Fopenafs.git

STABLE14-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 74c59231f..b61e6983d 100644
--- a/src/rx/rx_prototypes.h
+++ b/src/rx/rx_prototypes.h
@@ -583,8 +583,12 @@ extern int rx_getAllAddr(afs_int32 * buffer, int maxSize);
 extern void rxi_InitPeerParams(struct rx_peer *pp);
 
 #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);