From ec1a04d68cf9b16a1b425822c7e1a425ea40e11d Mon Sep 17 00:00:00 2001
From: guenther <>
Date: Sun, 13 Sep 2015 20:29:23 +0000
Subject: [PATCH] For now, permit overriding of the malloc family, to make
 emacs happy

---
 src/lib/libc/stdlib/malloc.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/lib/libc/stdlib/malloc.c b/src/lib/libc/stdlib/malloc.c
index 0967fe3a..dd4c4872 100644
--- a/src/lib/libc/stdlib/malloc.c
+++ b/src/lib/libc/stdlib/malloc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: malloc.c,v 1.175 2015/09/13 08:31:47 guenther Exp $	*/
+/*	$OpenBSD: malloc.c,v 1.176 2015/09/13 20:29:23 guenther Exp $	*/
 /*
  * Copyright (c) 2008, 2010, 2011 Otto Moerbeek <otto@drijf.net>
  * Copyright (c) 2012 Matthew Dempsky <matthew@openbsd.org>
@@ -1187,7 +1187,7 @@ malloc(size_t size)
 		errno = saved_errno;
 	return r;
 }
-DEF_STRONG(malloc);
+/*DEF_STRONG(malloc);*/
 
 static void
 ofree(void *p)
@@ -1291,7 +1291,7 @@ free(void *ptr)
 	_MALLOC_UNLOCK();
 	errno = saved_errno;
 }
-DEF_STRONG(free);
+/*DEF_STRONG(free);*/
 
 
 static void *
@@ -1432,7 +1432,7 @@ realloc(void *ptr, size_t size)
 		errno = saved_errno;
 	return r;
 }
-DEF_STRONG(realloc);
+/*DEF_STRONG(realloc);*/
 
 
 /*
@@ -1480,7 +1480,7 @@ calloc(size_t nmemb, size_t size)
 		errno = saved_errno;
 	return r;
 }
-DEF_STRONG(calloc);
+/*DEF_STRONG(calloc);*/
 
 static void *
 mapalign(struct dir_info *d, size_t alignment, size_t sz, int zero_fill)
@@ -1614,7 +1614,7 @@ err:
 	errno = saved_errno;
 	return res;
 }
-DEF_STRONG(posix_memalign);
+/*DEF_STRONG(posix_memalign);*/
 
 #ifdef MALLOC_STATS