diff options
| author | Bryce McKinlay <bryce@waitaki.otago.ac.nz> | 2001-10-16 09:01:40 +0000 |
|---|---|---|
| committer | Bryce McKinlay <bryce@gcc.gnu.org> | 2001-10-16 10:01:40 +0100 |
| commit | 4c7726b172c35bd078bb0f88025670ffddd94a92 (patch) | |
| tree | 483dc5098530e605b23e445c94fcdfdfec0d9b23 /boehm-gc/malloc.c | |
| parent | 107abb2f61f6e53ebb7aa05b78fdd9234ee7877c (diff) | |
| download | gcc-4c7726b172c35bd078bb0f88025670ffddd94a92.tar.gz | |
Makefile.am, [...]: Imported GC 6.1 Alpha 1 and merged local changes.
* Makefile.am, acinclude.m4, configure.in: Imported GC 6.1 Alpha 1
and merged local changes.
From-SVN: r46283
Diffstat (limited to 'boehm-gc/malloc.c')
| -rw-r--r-- | boehm-gc/malloc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/boehm-gc/malloc.c b/boehm-gc/malloc.c index 0bbb96abec0..943f27d337c 100644 --- a/boehm-gc/malloc.c +++ b/boehm-gc/malloc.c @@ -315,7 +315,7 @@ DCL_LOCK_STATE; /* It might help to manually inline the GC_malloc call here. */ /* But any decent compiler should reduce the extra procedure call */ /* to at most a jump instruction in this case. */ -# if defined(I386) && defined(SOLARIS_THREADS) +# if defined(I386) && defined(GC_SOLARIS_THREADS) /* * Thread initialisation can call malloc before * we're ready for it. @@ -324,7 +324,7 @@ DCL_LOCK_STATE; * inopportune times. */ if (!GC_is_initialized) return sbrk(lb); -# endif /* I386 && SOLARIS_THREADS */ +# endif /* I386 && GC_SOLARIS_THREADS */ return((GC_PTR)REDIRECT_MALLOC(lb)); } @@ -360,7 +360,7 @@ DCL_LOCK_STATE; h = HBLKPTR(p); hhdr = HDR(h); # if defined(REDIRECT_MALLOC) && \ - (defined(SOLARIS_THREADS) || defined(LINUX_THREADS) \ + (defined(GC_SOLARIS_THREADS) || defined(GC_LINUX_THREADS) \ || defined(__MINGW32__)) /* Should this be MSWIN32 in general? */ /* For Solaris, we have to redirect malloc calls during */ /* initialization. For the others, this seems to happen */ |