From 698d2c6803ac9f329c0f46aed89b385680b3a31e Mon Sep 17 00:00:00 2001
From: Eric Andersen <andersen@codepoet.org>
Date: Wed, 7 Aug 2002 07:57:49 +0000
Subject: 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

---
 libc/stdlib/malloc/Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'libc/stdlib/malloc/Makefile')

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)
 
-- 
cgit v1.2.3