summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorguenther <>2018-11-19 22:50:24 +0000
committerguenther <>2018-11-19 22:50:24 +0000
commitfb72f6d9b3e957a9d83c2dd3bcd482d4e6adb25d (patch)
tree1be61b46717a4ae2c1d83a106e9c1305a79dd09a
parent8f74a3828f3726e6172cf5fcfcd186f1272b1e22 (diff)
downloadopenbsd-fb72f6d9b3e957a9d83c2dd3bcd482d4e6adb25d.tar.gz
openbsd-fb72f6d9b3e957a9d83c2dd3bcd482d4e6adb25d.tar.bz2
openbsd-fb72f6d9b3e957a9d83c2dd3bcd482d4e6adb25d.zip
Fix compilation on alpha, where DEF_WEAK() really must be paired with
PROTO_NORMAL(). Problem noted by deraadt@
-rw-r--r--src/lib/libc/stdlib/malloc.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/lib/libc/stdlib/malloc.c b/src/lib/libc/stdlib/malloc.c
index ee4d4c055e..513defccbc 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.252 2018/11/18 16:15:18 otto Exp $ */ 1/* $OpenBSD: malloc.c,v 1.253 2018/11/19 22:50:24 guenther Exp $ */
2/* 2/*
3 * Copyright (c) 2008, 2010, 2011, 2016 Otto Moerbeek <otto@drijf.net> 3 * Copyright (c) 2008, 2010, 2011, 2016 Otto Moerbeek <otto@drijf.net>
4 * Copyright (c) 2012 Matthew Dempsky <matthew@openbsd.org> 4 * Copyright (c) 2012 Matthew Dempsky <matthew@openbsd.org>
@@ -1542,7 +1542,6 @@ malloc_usable_size(void *ptr)
1542 errno = saved_errno; 1542 errno = saved_errno;
1543 return sz; 1543 return sz;
1544} 1544}
1545DEF_WEAK(malloc_usable_size);
1546 1545
1547static void * 1546static void *
1548orealloc(struct dir_info *argpool, void *p, size_t newsz, void *f) 1547orealloc(struct dir_info *argpool, void *p, size_t newsz, void *f)