diff options
| author | Dave Jones <davej@redhat.com> | 2004-01-07 21:47:35 +0000 |
|---|---|---|
| committer | Frank Ch. Eigler <fche@gcc.gnu.org> | 2004-01-07 21:47:35 +0000 |
| commit | 5d2082d1474951aea430f2a835333f77026aa5a1 (patch) | |
| tree | 78f43b697b0ed5013d48edb480209ce3f565dd23 | |
| parent | 627e4e5fc2e189846e59f0b1d44182b319afba3b (diff) | |
| download | gcc-5d2082d1474951aea430f2a835333f77026aa5a1.zip gcc-5d2082d1474951aea430f2a835333f77026aa5a1.tar.gz gcc-5d2082d1474951aea430f2a835333f77026aa5a1.tar.bz2 | |
* approved by rth
2004-01-07 Dave Jones <davej@redhat.com>
* malloc.c (GC_generic_malloc): Correct initialization typo.
* mallocx.c (GC_generic_malloca_ignore_off_page): Ditto.
From-SVN: r75518
| -rw-r--r-- | boehm-gc/ChangeLog | 5 | ||||
| -rw-r--r-- | boehm-gc/malloc.c | 2 | ||||
| -rw-r--r-- | boehm-gc/mallocx.c | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/boehm-gc/ChangeLog b/boehm-gc/ChangeLog index 347a310..354e11b 100644 --- a/boehm-gc/ChangeLog +++ b/boehm-gc/ChangeLog @@ -1,3 +1,8 @@ +2004-01-07 Dave Jones <davej@redhat.com> + + * malloc.c (GC_generic_malloc): Correct initialization typo. + * mallocx.c (GC_generic_malloca_ignore_off_page): Ditto. + 2003-10-31 Richard Earnshaw <rearnsha@arm.com> * include/private/gcconfig.h: Re-install change of 2003-04-16. diff --git a/boehm-gc/malloc.c b/boehm-gc/malloc.c index f5c8f06..353a9bc 100644 --- a/boehm-gc/malloc.c +++ b/boehm-gc/malloc.c @@ -217,7 +217,7 @@ register int k; GC_words_allocd += lw; UNLOCK(); ENABLE_SIGNALS(); - if (init & !GC_debugging_started && 0 != result) { + if (init && !GC_debugging_started && 0 != result) { BZERO(result, n_blocks * HBLKSIZE); } } diff --git a/boehm-gc/mallocx.c b/boehm-gc/mallocx.c index 06f4562..84993da 100644 --- a/boehm-gc/mallocx.c +++ b/boehm-gc/mallocx.c @@ -202,7 +202,7 @@ register int k; if (0 == result) { return((*GC_oom_fn)(lb)); } else { - if (init & !GC_debugging_started) { + if (init && !GC_debugging_started) { BZERO(result, n_blocks * HBLKSIZE); } return(result); |