diff options
| author | Adam Megacz <adam@xwt.org> | 2002-03-12 19:06:36 +0000 |
|---|---|---|
| committer | Adam Megacz <megacz@gcc.gnu.org> | 2002-03-12 19:06:36 +0000 |
| commit | 916c46b5ab32a7cc6deb435c8f2a9451edd39208 (patch) | |
| tree | ba69ee2014e9ab9f0759258ec9d82f1ac809d901 /boehm-gc/mark.c | |
| parent | 089c8f976485ea1a57ca4d6590cea48782c51140 (diff) | |
| download | gcc-916c46b5ab32a7cc6deb435c8f2a9451edd39208.zip gcc-916c46b5ab32a7cc6deb435c8f2a9451edd39208.tar.gz gcc-916c46b5ab32a7cc6deb435c8f2a9451edd39208.tar.bz2 | |
dyn_load.c: Renamed GC_win32s to GC_no_win32_dlls.
2002-03-12 Adam Megacz <adam@xwt.org>
* dyn_load.c: Renamed GC_win32s to GC_no_win32_dlls.
* misc.c: Renamed GC_is_win32s() to GC_no_win32_dlls
* os_dep.c: Renamed GC_win32s to GC_no_win32_dlls and
statically initialized it to TRUE if compiling with GCC.
* win32_threads.c (thread_start): We no longer use SEH if
compiling with GCC.
* mark.c (GC_mark_some): We no longer use SEH if
compiling with GCC.
From-SVN: r50671
Diffstat (limited to 'boehm-gc/mark.c')
| -rw-r--r-- | boehm-gc/mark.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/boehm-gc/mark.c b/boehm-gc/mark.c index 70ba135..170c279 100644 --- a/boehm-gc/mark.c +++ b/boehm-gc/mark.c @@ -264,7 +264,7 @@ static void alloc_mark_stack(); GC_bool GC_mark_some(cold_gc_frame) ptr_t cold_gc_frame; { -#ifdef MSWIN32 +#if defined(MSWIN32) && !defined(__GNUC__) /* Windows 98 appears to asynchronously create and remove writable */ /* memory mappings, for reasons we haven't yet understood. Since */ /* we look for writable regions to determine the root set, we may */ @@ -274,7 +274,7 @@ ptr_t cold_gc_frame; /* Note that this code should never generate an incremental GC write */ /* fault. */ __try { -#endif +#endif /* defined(MSWIN32) && !defined(__GNUC__) */ switch(GC_mark_state) { case MS_NONE: return(FALSE); @@ -395,7 +395,7 @@ ptr_t cold_gc_frame; ABORT("GC_mark_some: bad state"); return(FALSE); } -#ifdef MSWIN32 +#if defined(MSWIN32) && !defined(__GNUC__) } __except (GetExceptionCode() == EXCEPTION_ACCESS_VIOLATION ? EXCEPTION_EXECUTE_HANDLER : EXCEPTION_CONTINUE_SEARCH) { # ifdef CONDPRINT @@ -410,7 +410,7 @@ ptr_t cold_gc_frame; scan_ptr = 0; return FALSE; } -#endif /* MSWIN32 */ +#endif /* defined(MSWIN32) && !defined(__GNUC__) */ } |