diff options
author | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 1999-11-01 23:15:51 +0000 |
---|---|---|
committer | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 1999-11-01 23:15:51 +0000 |
commit | 9bc8642e1f366a35c305b9abe9e01bf934b584b9 (patch) | |
tree | 9c24ba1ebabff472b9caddbff07ef957dbf2c24c /boehm-gc/typd_mlc.c | |
parent | 79eaf784f16b0e8079d9dca062a0fc959d289d18 (diff) | |
download | gcc-9bc8642e1f366a35c305b9abe9e01bf934b584b9.tar.gz |
Merged GC 5.0alpha4 with local changes, plus:
* Makefile.in: Rebuilt.
* Makefile.am (gctest_LDADD): Added THREADLIB.
(TESTS): New macro.
* configure: Rebuilt.
* configure.in (INCLUDES): New subst.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@30332 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'boehm-gc/typd_mlc.c')
-rw-r--r-- | boehm-gc/typd_mlc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/boehm-gc/typd_mlc.c b/boehm-gc/typd_mlc.c index 387d2305829..74f455d926c 100644 --- a/boehm-gc/typd_mlc.c +++ b/boehm-gc/typd_mlc.c @@ -632,7 +632,7 @@ ptr_t GC_clear_stack(); (GC_PTR)GC_clear_stack(GC_generic_malloc((word)lb, k)) #define GENERAL_MALLOC_IOP(lb,k) \ - (GC_PTR)GC_clear_stack(GC_generic_malloc_ignore_off_page((word)lb, k)) + (GC_PTR)GC_clear_stack(GC_generic_malloc_ignore_off_page(lb, k)) #if defined(__STDC__) || defined(__cplusplus) void * GC_malloc_explicitly_typed(size_t lb, GC_descr d) @@ -702,7 +702,7 @@ DCL_LOCK_STATE; FASTLOCK(); if( !FASTLOCK_SUCCEEDED() || (op = *opp) == 0 ) { FASTUNLOCK(); - op = (ptr_t)GENERAL_MALLOC_IOP((word)lb, GC_explicit_kind); + op = (ptr_t)GENERAL_MALLOC_IOP(lb, GC_explicit_kind); # ifdef MERGE_SIZES lw = GC_size_map[lb]; /* May have been uninitialized. */ # endif @@ -712,7 +712,7 @@ DCL_LOCK_STATE; FASTUNLOCK(); } } else { - op = (ptr_t)GENERAL_MALLOC_IOP((word)lb, GC_explicit_kind); + op = (ptr_t)GENERAL_MALLOC_IOP(lb, GC_explicit_kind); if (op != NULL) lw = BYTES_TO_WORDS(GC_size(op)); } |