diff options
| author | guenther <> | 2015-09-13 20:29:23 +0000 |
|---|---|---|
| committer | guenther <> | 2015-09-13 20:29:23 +0000 |
| commit | dcd4d5509d6bf753588a993688daf1132f50a7ed (patch) | |
| tree | b5b054e96ef76a08f618cbbf449e3b47c24d62f5 /src/lib | |
| parent | 701dee66b52312cdda7baf741e156324d3f64d2f (diff) | |
| download | openbsd-dcd4d5509d6bf753588a993688daf1132f50a7ed.tar.gz openbsd-dcd4d5509d6bf753588a993688daf1132f50a7ed.tar.bz2 openbsd-dcd4d5509d6bf753588a993688daf1132f50a7ed.zip | |
For now, permit overriding of the malloc family, to make emacs happy
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/libc/stdlib/malloc.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/libc/stdlib/malloc.c b/src/lib/libc/stdlib/malloc.c index 0967fe3a08..dd4c487241 100644 --- a/src/lib/libc/stdlib/malloc.c +++ b/src/lib/libc/stdlib/malloc.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: malloc.c,v 1.175 2015/09/13 08:31:47 guenther Exp $ */ | 1 | /* $OpenBSD: malloc.c,v 1.176 2015/09/13 20:29:23 guenther Exp $ */ |
| 2 | /* | 2 | /* |
| 3 | * Copyright (c) 2008, 2010, 2011 Otto Moerbeek <otto@drijf.net> | 3 | * Copyright (c) 2008, 2010, 2011 Otto Moerbeek <otto@drijf.net> |
| 4 | * Copyright (c) 2012 Matthew Dempsky <matthew@openbsd.org> | 4 | * Copyright (c) 2012 Matthew Dempsky <matthew@openbsd.org> |
| @@ -1187,7 +1187,7 @@ malloc(size_t size) | |||
| 1187 | errno = saved_errno; | 1187 | errno = saved_errno; |
| 1188 | return r; | 1188 | return r; |
| 1189 | } | 1189 | } |
| 1190 | DEF_STRONG(malloc); | 1190 | /*DEF_STRONG(malloc);*/ |
| 1191 | 1191 | ||
| 1192 | static void | 1192 | static void |
| 1193 | ofree(void *p) | 1193 | ofree(void *p) |
| @@ -1291,7 +1291,7 @@ free(void *ptr) | |||
| 1291 | _MALLOC_UNLOCK(); | 1291 | _MALLOC_UNLOCK(); |
| 1292 | errno = saved_errno; | 1292 | errno = saved_errno; |
| 1293 | } | 1293 | } |
| 1294 | DEF_STRONG(free); | 1294 | /*DEF_STRONG(free);*/ |
| 1295 | 1295 | ||
| 1296 | 1296 | ||
| 1297 | static void * | 1297 | static void * |
| @@ -1432,7 +1432,7 @@ realloc(void *ptr, size_t size) | |||
| 1432 | errno = saved_errno; | 1432 | errno = saved_errno; |
| 1433 | return r; | 1433 | return r; |
| 1434 | } | 1434 | } |
| 1435 | DEF_STRONG(realloc); | 1435 | /*DEF_STRONG(realloc);*/ |
| 1436 | 1436 | ||
| 1437 | 1437 | ||
| 1438 | /* | 1438 | /* |
| @@ -1480,7 +1480,7 @@ calloc(size_t nmemb, size_t size) | |||
| 1480 | errno = saved_errno; | 1480 | errno = saved_errno; |
| 1481 | return r; | 1481 | return r; |
| 1482 | } | 1482 | } |
| 1483 | DEF_STRONG(calloc); | 1483 | /*DEF_STRONG(calloc);*/ |
| 1484 | 1484 | ||
| 1485 | static void * | 1485 | static void * |
| 1486 | mapalign(struct dir_info *d, size_t alignment, size_t sz, int zero_fill) | 1486 | mapalign(struct dir_info *d, size_t alignment, size_t sz, int zero_fill) |
| @@ -1614,7 +1614,7 @@ err: | |||
| 1614 | errno = saved_errno; | 1614 | errno = saved_errno; |
| 1615 | return res; | 1615 | return res; |
| 1616 | } | 1616 | } |
| 1617 | DEF_STRONG(posix_memalign); | 1617 | /*DEF_STRONG(posix_memalign);*/ |
| 1618 | 1618 | ||
| 1619 | #ifdef MALLOC_STATS | 1619 | #ifdef MALLOC_STATS |
| 1620 | 1620 | ||