summaryrefslogtreecommitdiffstats
path: root/lib/libstand/zalloc_malloc.c
diff options
context:
space:
mode:
authordfr <dfr@FreeBSD.org>1998-09-26 10:48:50 +0000
committerdfr <dfr@FreeBSD.org>1998-09-26 10:48:50 +0000
commit236ad5eb3ca90664e90a383de91faa975d35b8fc (patch)
tree989ae7fd62fa828548abf140a14e99223404b32b /lib/libstand/zalloc_malloc.c
parent3833ff5964a8f10b3b3cf9cf15c3c52481429c9a (diff)
downloadFreeBSD-src-236ad5eb3ca90664e90a383de91faa975d35b8fc.zip
FreeBSD-src-236ad5eb3ca90664e90a383de91faa975d35b8fc.tar.gz
* Enable old UFS compatibility code for booting from Digital Unix formatted
disks. * Fix a whole raft of warnings, printf and otherwise. * Make zalloc work for alpha (just a case of using the right typedef). * Add some (disabled) malloc debug printing to stand.h.
Diffstat (limited to 'lib/libstand/zalloc_malloc.c')
-rw-r--r--lib/libstand/zalloc_malloc.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/libstand/zalloc_malloc.c b/lib/libstand/zalloc_malloc.c
index 79e6c80..85d2a85 100644
--- a/lib/libstand/zalloc_malloc.c
+++ b/lib/libstand/zalloc_malloc.c
@@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id$
+ * $Id: zalloc_malloc.c,v 1.1 1998/09/26 01:42:39 msmith Exp $
*/
/*
@@ -44,6 +44,11 @@ static int MallocCount;
void mallocstats(void);
#endif
+#ifdef malloc
+#undef malloc
+#undef free
+#endif
+
void *
malloc(size_t bytes)
{
OpenPOWER on IntegriCloud