diff options
Diffstat (limited to 'lib/libc')
| -rw-r--r-- | lib/libc/hidden/stdlib.h | 12 | ||||
| -rw-r--r-- | lib/libc/stdlib/malloc.c | 12 |
2 files changed, 12 insertions, 12 deletions
diff --git a/lib/libc/hidden/stdlib.h b/lib/libc/hidden/stdlib.h index 70f7f6e8108..3b63f4004ae 100644 --- a/lib/libc/hidden/stdlib.h +++ b/lib/libc/hidden/stdlib.h @@ -1,4 +1,4 @@ -/* $OpenBSD: stdlib.h,v 1.2 2015/09/13 15:20:40 guenther Exp $ */ +/* $OpenBSD: stdlib.h,v 1.3 2015/09/13 20:29:23 guenther Exp $ */ /* $NetBSD: stdlib.h,v 1.25 1995/12/27 21:19:08 jtc Exp $ */ /*- @@ -57,7 +57,7 @@ PROTO_NORMAL(atoi); PROTO_STD_DEPRECATED(atol); PROTO_STD_DEPRECATED(atoll); PROTO_STD_DEPRECATED(bsearch); -PROTO_NORMAL(calloc); +/*PROTO_NORMAL(calloc); not yet, breaks emacs */ PROTO_NORMAL(cgetcap); PROTO_NORMAL(cgetclose); PROTO_NORMAL(cgetent); @@ -77,7 +77,7 @@ PROTO_DEPRECATED(ecvt); PROTO_NORMAL(erand48); PROTO_NORMAL(exit); PROTO_DEPRECATED(fcvt); -PROTO_NORMAL(free); +/*PROTO_NORMAL(free); not yet, breaks emacs */ PROTO_DEPRECATED(gcvt); PROTO_DEPRECATED(getbsize); PROTO_NORMAL(getenv); @@ -96,7 +96,7 @@ PROTO_DEPRECATED(ldiv); PROTO_STD_DEPRECATED(llabs); PROTO_STD_DEPRECATED(lldiv); PROTO_DEPRECATED(lrand48); -PROTO_NORMAL(malloc); +/*PROTO_NORMAL(malloc); not yet, breaks emacs */ PROTO_STD_DEPRECATED(mblen); PROTO_STD_DEPRECATED(mbstowcs); PROTO_STD_DEPRECATED(mbtowc); @@ -109,7 +109,7 @@ PROTO_DEPRECATED(mkstemps); PROTO_DEPRECATED(mktemp); PROTO_DEPRECATED(mrand48); PROTO_DEPRECATED(nrand48); -PROTO_NORMAL(posix_memalign); +/*PROTO_NORMAL(posix_memalign); not yet, breaks emacs */ PROTO_DEPRECATED(posix_openpt); PROTO_DEPRECATED(ptsname); PROTO_NORMAL(putenv); @@ -120,7 +120,7 @@ PROTO_DEPRECATED(radixsort); PROTO_STD_DEPRECATED(rand); PROTO_NORMAL(rand_r); PROTO_DEPRECATED(random); -PROTO_NORMAL(realloc); +/*PROTO_NORMAL(realloc); not yet, breaks emacs */ PROTO_NORMAL(reallocarray); PROTO_DEPRECATED(realpath); PROTO_DEPRECATED(seed48); diff --git a/lib/libc/stdlib/malloc.c b/lib/libc/stdlib/malloc.c index 0967fe3a088..dd4c487241a 100644 --- a/lib/libc/stdlib/malloc.c +++ b/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 |