summaryrefslogtreecommitdiff
path: root/malloc.c
diff options
context:
space:
mode:
authorhboehm <hboehm>2007-06-07 04:53:32 +0200
committerIvan Maidanski <ivmai@mail.ru>2011-07-26 19:06:40 +0200
commit16509ab0ddba3346db6ad5ca44a0c9e2cbda31a3 (patch)
tree47210e56e470e96e6de9ea57da8899a1cb21ab3f /malloc.c
parente8a9ac333a5cb33944ec8a4c9c2884c4980c8cd7 (diff)
2007-06-06 Hans Boehm <Hans.Boehm@hp.com>
* Makefile.am, Makefile.direct: Add NT_X64_STATIC_THREADS_MAKEFILE. * Makefile.in: Regenerate. * NT_X64_STATIC_THREADS_MAKEFILE: Fix warning flags. * allochblk.c, alloc.c, blacklst.c, dbg_malc.c, dyn_load.c, finalize.c, headers.c, mach_dep.c, malloc.c, mark.c, misc.c, obj_map.c, os_dep.c, ptr_chck.c, reclaim.c, typd_mlc.c, win32_threads.c, cord/de_win.c, include/gc_mark.h, include/private/gc_hdrs.h, include/private/gc_pmark.h, include/private/gc_priv.h, tests/test_cpp.cc: Replace old style function declarations. Clean up integral types. Remove register declarations. The change in malloc.c and the "int descr" declaration in mark.c are the most likely to have been real bugs outside of win64. * msvc_dbg.c: Disable on win64. * win32_threads.c: Add AMD64 support. * include/gc.h: no backtrace on AMD64 for now.
Diffstat (limited to 'malloc.c')
-rw-r--r--malloc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/malloc.c b/malloc.c
index 7a546a6..9403264 100644
--- a/malloc.c
+++ b/malloc.c
@@ -64,7 +64,7 @@ ptr_t GC_alloc_large(size_t lb, int k, unsigned flags)
if (h == 0) {
result = 0;
} else {
- int total_bytes = n_blocks * HBLKSIZE;
+ size_t total_bytes = n_blocks * HBLKSIZE;
if (n_blocks > 1) {
GC_large_allocd_bytes += total_bytes;
if (GC_large_allocd_bytes > GC_max_large_allocd_bytes)