From: Antoine Verheijen Date: Wed, 19 Jan 2011 18:20:21 +0000 (-0700) Subject: OpenBSD: Remove macros definitions for afs_osi_Alloc et al. X-Git-Tag: upstream/1.8.0_pre1^2~4276 X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=1c7420422313375f7132479c588f09eabac73c70;p=packages%2Fo%2Fopenafs.git OpenBSD: Remove macros definitions for afs_osi_Alloc et al. The afs_osi_Alloc, afs_osi_Free, etc. routines are now defined in afs_osi_alloc.c so the macro definitions defined by osi_machdep.h for OpenBSD are no longer needed and, in fact, interfere with the compile. Remove them. Change-Id: I98a261b5cd5e44136e4dde677f86d90212b0cfba Reviewed-on: http://gerrit.openafs.org/3681 Tested-by: BuildBot Reviewed-by: Derrick Brashear --- diff --git a/src/afs/OBSD/osi_machdep.h b/src/afs/OBSD/osi_machdep.h index 7603a229e..61ed43e7d 100644 --- a/src/afs/OBSD/osi_machdep.h +++ b/src/afs/OBSD/osi_machdep.h @@ -64,11 +64,6 @@ inline void afs_osi_FreeStr(char *x); extern void *osi_obsd_Alloc(size_t asize, int cansleep); extern void osi_obsd_Free(void *p, size_t asize); -#define afs_osi_Alloc_NoSleep(asize) osi_obsd_Alloc((asize), 0) -#define afs_osi_Alloc(asize) osi_obsd_Alloc((asize), 1) -#define afs_osi_FreeStr(s) afs_osi_Free((s), strlen((s)) + 1) -#define afs_osi_Free(buf, asize) osi_obsd_Free((buf), (asize)) - #ifdef AFS_KALLOC #undef AFS_KALLOC #define AFS_KALLOC(s) osi_obsd_Alloc((s), 1 /* cansleep */)