diff options
| author | Eric Andersen <andersen@codepoet.org> | 2002-08-07 07:57:49 +0000 |
|---|---|---|
| committer | Eric Andersen <andersen@codepoet.org> | 2002-08-07 07:57:49 +0000 |
| commit | 698d2c6803ac9f329c0f46aed89b385680b3a31e (patch) | |
| tree | 59793ecae777f3d2a480bef1be1af4f39e76f9c6 /libc/stdlib/malloc | |
| parent | 99eb56df380e887832f121dc3680d4d7848a0050 (diff) | |
Per suggestion from Miles Bader, move calloc.c to libc/stdlib.
Also, Manuel notices that I forgot to check for when nmemb=0,
which would result in a segfault, so fix that case as well.
-Erik
Diffstat (limited to 'libc/stdlib/malloc')
| -rw-r--r-- | libc/stdlib/malloc/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libc/stdlib/malloc/Makefile b/libc/stdlib/malloc/Makefile index 30e5b9e2a..ecf05377d 100644 --- a/libc/stdlib/malloc/Makefile +++ b/libc/stdlib/malloc/Makefile @@ -24,8 +24,9 @@ TOPDIR=../../../ include $(TOPDIR)Rules.mak +# calloc.c can be found at uClibc/libc/stdlib/calloc.c CSRC = malloc.o free.o realloc.o heap_alloc.o \ - heap_alloc_at.o heap_free.o ../malloc-930716/calloc.o + heap_alloc_at.o heap_free.o COBJS=$(patsubst %.c,%.o, $(CSRC)) OBJS=$(COBJS) |