From: Ben Kaduk Date: Tue, 9 Mar 2010 04:38:15 +0000 (-0500) Subject: Export prototypes for osi_fbsd_{alloc,free} for use in rx X-Git-Tag: openafs-devel-1_5_73~80 X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=2724e9ee8544ad5bf598e6552ab9a42ed615aa88;p=packages%2Fo%2Fopenafs.git Export prototypes for osi_fbsd_{alloc,free} for use in rx Include prototypes for osi_fbsd_alloc() and osi_fbsd_free() in osi_machdep.h, since afs_prototypes.h is not included when compiling the rx code. afs_osi_Alloc_NoSleep is #defined to be osi_fbsd_free, and is used in the rx code; if the prototype for the latter is not included, then int is assumed for all parameters and return values, which breaks the calling convention for 64-bit pointers. Change-Id: I3d7575525f159097d1f8ca9ecb22af9f27b63111 Reviewed-on: http://gerrit.openafs.org/1541 Reviewed-by: Derrick Brashear Tested-by: Derrick Brashear --- diff --git a/src/afs/FBSD/osi_machdep.h b/src/afs/FBSD/osi_machdep.h index 4c048840a..e22760bf3 100644 --- a/src/afs/FBSD/osi_machdep.h +++ b/src/afs/FBSD/osi_machdep.h @@ -76,6 +76,10 @@ extern int (**afs_vnodeop_p) (); #define afs_strcat(s1, s2) strcat((s1), (s2)) +/* malloc */ +extern void *osi_fbsd_alloc(size_t size, int dropglobal); +extern void osi_fbsd_free(void *p); + #undef afs_osi_Alloc_NoSleep #define afs_osi_Alloc_NoSleep(size) osi_fbsd_alloc((size), 0)