diff options
| author | Nicola Pero <nicola.pero@meta-innovation.com> | 2010-09-12 14:55:21 +0000 |
|---|---|---|
| committer | Nicola Pero <nicola@gcc.gnu.org> | 2010-09-12 14:55:21 +0000 |
| commit | 7e26828068e0242923b64942ab2f819cbaeef9ce (patch) | |
| tree | 3eea0fc31fc22bc008c32ffdfb470e34e07e329e /libobjc/memory.c | |
| parent | 075abad5eeda59a71431e749ff167e15f7904962 (diff) | |
| download | gcc-7e26828068e0242923b64942ab2f819cbaeef9ce.zip gcc-7e26828068e0242923b64942ab2f819cbaeef9ce.tar.gz gcc-7e26828068e0242923b64942ab2f819cbaeef9ce.tar.bz2 | |
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
Diffstat (limited to 'libobjc/memory.c')
| -rw-r--r-- | libobjc/memory.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libobjc/memory.c b/libobjc/memory.c index 2ebd429..19a450a 100644 --- a/libobjc/memory.c +++ b/libobjc/memory.c @@ -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; |