summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorIvan Maidanski <ivmai@mail.ru>2012-04-02 20:31:22 +0200
committerIvan Maidanski <ivmai@mail.ru>2012-04-03 06:15:54 +0200
commitcad34343056a5f9b4598b5ddc36ed8ce0e264399 (patch)
treeb0e0408635970f85a7584372ad6557449c1122f4 /include
parent1555aa8dd31db657c0ad5eed618757157783c2e5 (diff)
FIX: Disable incremental mode on Darwin if fork handling requested
* doc/README.macros (NO_HANDLE_FORK): Replace back with HANDLE_FORK and update. * include/private/gcconfig.h (CAN_HANDLE_FORK): Define also for Darwin in case of MPROTECT_VDB. * misc.c (GC_set_handle_fork): Handle Darwin properly; add comment. * os_dep.c (GC_dirty_init): Do not turn on GC_dirty_maintained for Darwin if GC_handle_fork is on; add comment; remove FIXME. * pthread_support.c (GC_fork_prepare_proc): Remove WARN for Darwin (since GC_dirty_maintained is off in that case). * pthread_support.c (GC_fork_child_proc): Remove comment (for Darwin).
Diffstat (limited to 'include')
-rw-r--r--include/private/gcconfig.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/private/gcconfig.h b/include/private/gcconfig.h
index 7ecc80f..4d27bde 100644
--- a/include/private/gcconfig.h
+++ b/include/private/gcconfig.h
@@ -2594,7 +2594,7 @@
#if !defined(CAN_HANDLE_FORK) && !defined(NO_HANDLE_FORK) \
&& ((defined(GC_PTHREADS) && !defined(HURD) && !defined(NACL) \
&& !defined(PLATFORM_ANDROID) && !defined(GC_WIN32_PTHREADS)) \
- || defined(HANDLE_FORK))
+ || (defined(DARWIN) && defined(MPROTECT_VDB)) || defined(HANDLE_FORK))
/* Attempts (where supported and requested) to make GC_malloc work in */
/* a child process fork'ed from a multi-threaded parent. */
# define CAN_HANDLE_FORK