diff options
author | Rich Felker <dalias@aerifal.cx> | 2015-06-22 20:33:28 +0000 |
---|---|---|
committer | Rich Felker <dalias@aerifal.cx> | 2015-06-22 20:33:28 +0000 |
commit | 153e952e1a688859d7095345b17e6c1df74a295c (patch) | |
tree | 0edbb45cb52967ba9c379191b78c0b6a5db4784b /src | |
parent | ba819787ee93ceae94efd274f7849e317c1bff58 (diff) | |
download | musl-153e952e1a688859d7095345b17e6c1df74a295c.tar.gz musl-153e952e1a688859d7095345b17e6c1df74a295c.tar.bz2 musl-153e952e1a688859d7095345b17e6c1df74a295c.tar.xz musl-153e952e1a688859d7095345b17e6c1df74a295c.zip |
fix regression/typo that disabled __simple_malloc when calloc is used
commit ba819787ee93ceae94efd274f7849e317c1bff58 introduced this
regression. since the __malloc0 weak alias was not properly provided
by __simple_malloc, use of calloc forced the full malloc to be linked.
Diffstat (limited to 'src')
-rw-r--r-- | src/malloc/lite_malloc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/malloc/lite_malloc.c b/src/malloc/lite_malloc.c index b09f30b0..09ac5755 100644 --- a/src/malloc/lite_malloc.c +++ b/src/malloc/lite_malloc.c @@ -47,4 +47,4 @@ void *__simple_malloc(size_t n) } weak_alias(__simple_malloc, malloc); -weak_alias(__simple_malloc, malloc0); +weak_alias(__simple_malloc, __malloc0); |