summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIvan Maidanski <ivmai@mail.ru>2013-07-15 16:08:01 +0200
committerIvan Maidanski <ivmai@mail.ru>2013-07-15 16:08:01 +0200
commit07676ad23c787fc5d399830308ae2a749151c627 (patch)
tree4f4816e418daf239836c9dafdb70b9ac67b34183
parentad1386b5f82d4319406389787605165c94602a67 (diff)
Test NO_WRAP_MARK_SOME macro to suppress WRAP_MARK_SOME-specific code
* mark.c (WRAP_MARK_SOME): Do not define if NO_WRAP_MARK_SOME defined.
-rw-r--r--mark.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/mark.c b/mark.c
index 41de14c..9aa13ec 100644
--- a/mark.c
+++ b/mark.c
@@ -288,9 +288,10 @@ STATIC struct hblk * GC_push_next_marked_uncollectable(struct hblk *h);
static void alloc_mark_stack(size_t);
-# if (defined(MSWIN32) || defined(MSWINCE)) && !defined(__GNUC__) \
- || defined(MSWIN32) && defined(I386) /* for Win98 */ \
- || defined(USE_PROC_FOR_LIBRARIES) && defined(THREADS)
+# if (((defined(MSWIN32) || defined(MSWINCE)) && !defined(__GNUC__)) \
+ || (defined(MSWIN32) && defined(I386)) /* for Win98 */ \
+ || (defined(USE_PROC_FOR_LIBRARIES) && defined(THREADS))) \
+ && !defined(NO_WRAP_MARK_SOME)
/* Under rare conditions, we may end up marking from nonexistent memory. */
/* Hence we need to be prepared to recover by running GC_mark_some */
/* with a suitable handler in place. */