aboutsummaryrefslogtreecommitdiff
path: root/include/stdlib.h
diff options
context:
space:
mode:
authorJason Evans <jasone@FreeBSD.org>2012-04-17 07:22:14 +0000
committerJason Evans <jasone@FreeBSD.org>2012-04-17 07:22:14 +0000
commita4bd5210d5e680818a9319a76ebf71caef95bcd3 (patch)
tree24efdb5b31d087479e78f72f3b772bd5b02e470c /include/stdlib.h
parentf846cf42aba965444d2fa8025aa380197f85b777 (diff)
Notes
Diffstat (limited to 'include/stdlib.h')
-rw-r--r--include/stdlib.h7
1 files changed, 3 insertions, 4 deletions
diff --git a/include/stdlib.h b/include/stdlib.h
index 7aa5db62fd04..b73a54fa891c 100644
--- a/include/stdlib.h
+++ b/include/stdlib.h
@@ -155,7 +155,7 @@ _Noreturn void _Exit(int);
* If we're in a mode greater than C99, expose C11 functions.
*/
#if __ISO_C_VISIBLE >= 2011 || __cplusplus >= 201103L
-void * aligned_alloc(size_t, size_t);
+void * aligned_alloc(size_t, size_t) __malloc_like;
int at_quick_exit(void (*)(void));
_Noreturn void
quick_exit(int);
@@ -228,9 +228,8 @@ int unlockpt(int);
#endif /* __XSI_VISIBLE */
#if __BSD_VISIBLE
-extern const char *_malloc_options;
-extern void (*_malloc_message)(const char *, const char *, const char *,
- const char *);
+extern const char *malloc_conf;
+extern void (*malloc_message)(void *, const char *);
/*
* The alloca() function can't be implemented in C, and on some