Commit 7e268280 by Nicola Pero Committed by Nicola Pero

In libobjc/:

        * Makefile.in (%_gc.lo): New pattern rules to build the
        garbage-collected version of the library.  Removed rules for
        specific files that are no longer needed.  Standardized all rules.
        (C_SOURCE_FILES, OBJC_SOURCE_FILES): New variables.
        (OBJS, OBJS_GC): Compute these from C_SOURCE_FILES and
        OBJC_SOURCE_FILES.
        (INCLUDES): Removed the unused include -I$(srcdir)/objc.

        * memory.c (objc_calloc): Fixed call to GC_malloc when building
        with Garbage Colletion.

From-SVN: r164231
parent 075abad5
2010-09-12 Nicola Pero <nicola.pero@meta-innovation.com>
* Makefile.in (%_gc.lo): New pattern rules to build the
garbage-collected version of the library. Removed rules for
specific files that are no longer needed. Standardized all rules.
(C_SOURCE_FILES, OBJC_SOURCE_FILES): New variables.
(OBJS, OBJS_GC): Compute these from C_SOURCE_FILES and
OBJC_SOURCE_FILES.
(INCLUDES): Removed the unused include -I$(srcdir)/objc.
2010-09-12 Nicola Pero <nicola.pero@meta-innovation.com>
* memory.c (objc_calloc): Fixed call to GC_malloc when building
with Garbage Colletion.
2010-09-12 Nicola Pero <nicola.pero@meta-innovation.com>
* memory.c: Do not include objc-private/runtime.h.
2010-09-12 Nicola Pero <nicola.pero@meta-innovation.com>
......
......@@ -78,7 +78,7 @@ objc_calloc (size_t nelem, size_t size)
{
/* Note that GC_malloc returns cleared memory (see documentation) so
there is no need to clear it. */
void *res = (void *)(GC_malloc (nelem, size));
void *res = (void *)(GC_malloc (nelem * size));
if (! res)
_objc_abort ("Virtual memory exhausted\n");
return res;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment