summaryrefslogtreecommitdiff
path: root/boehm-gc/mark.c
diff options
context:
space:
mode:
authormegacz <megacz@138bc75d-0d04-0410-961f-82ee72b054a4>2002-03-12 19:06:36 +0000
committermegacz <megacz@138bc75d-0d04-0410-961f-82ee72b054a4>2002-03-12 19:06:36 +0000
commit2da4cb5f26a0b54af5f0d6eb4b33e2e91ad5f4aa (patch)
treeba69ee2014e9ab9f0759258ec9d82f1ac809d901 /boehm-gc/mark.c
parent9f58be3ba2024b27d4658930792b224406fb59f2 (diff)
downloadgcc-2da4cb5f26a0b54af5f0d6eb4b33e2e91ad5f4aa.tar.gz
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. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@50671 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'boehm-gc/mark.c')
-rw-r--r--boehm-gc/mark.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/boehm-gc/mark.c b/boehm-gc/mark.c
index 70ba135f1ab..170c279b718 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__) */
}