/*
* Copyright 2000, International Business Machines Corporation and others.
* All Rights Reserved.
- *
+ *
* This software has been released under the terms of the IBM Public
* License. For details, see the LICENSE file in the top-level source
* directory or online at http://www.openafs.org/dl/license10.html
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 */)
#endif
+#define AFS_KALLOC(s) osi_obsd_Alloc((s), 1 /* cansleep */)
#ifdef AFS_KFREE
#undef AFS_KFREE
-#define AFS_KFREE(p, s) (osi_obsd_Free((p), (s)))
#endif
+#define AFS_KFREE(p, s) (osi_obsd_Free((p), (s)))
#ifdef AFS_OBSD42_ENV
/* removed, live with it */
free((p), (mflags))
#else
#define BSD_KMALLOC MALLOC
-#define BSD_KFREE KFREE
+#define BSD_KFREE FREE
#endif /* AFS_OBSD42_ENV */
/* proc, cred */