summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordas <das>2008-03-11 23:52:31 (GMT)
committerdas <das>2008-03-11 23:52:31 (GMT)
commitb85919a586fb92b2e24b97ab1f7c5eb908acec4b (patch)
treef8d0766b836d8f6ee91817ef2e27d58514a60b53
parent7223803e14a2d1cc68da29b1919c9505c6095852 (diff)
downloadtcl-b85919a586fb92b2e24b97ab1f7c5eb908acec4b.zip
tcl-b85919a586fb92b2e24b97ab1f7c5eb908acec4b.tar.gz
tcl-b85919a586fb92b2e24b97ab1f7c5eb908acec4b.tar.bz2
* macosx/tclMacOSXNotify.c: avoid using CoreFoundation after fork() on
Darwin 9 even when TclpCreateProcess() uses vfork().
-rw-r--r--ChangeLog5
-rw-r--r--macosx/tclMacOSXNotify.c10
2 files changed, 8 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 1f6439e..5e4bc52 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-03-11 Daniel Steffen <das@users.sourceforge.net>
+
+ * macosx/tclMacOSXNotify.c: avoid using CoreFoundation after fork() on
+ Darwin 9 even when TclpCreateProcess() uses vfork().
+
2008-03-07 Don Porter <dgp@users.sourceforge.net>
* generic/tclExecute.c (Tcl_ExprObj): Revised expression bytecode
diff --git a/macosx/tclMacOSXNotify.c b/macosx/tclMacOSXNotify.c
index 2f9c62a..7fb8774 100644
--- a/macosx/tclMacOSXNotify.c
+++ b/macosx/tclMacOSXNotify.c
@@ -7,12 +7,12 @@
*
* Copyright (c) 1995-1997 Sun Microsystems, Inc.
* Copyright 2001, Apple Computer, Inc.
- * Copyright (c) 2005-2007 Daniel A. Steffen <das@users.sourceforge.net>
+ * Copyright (c) 2005-2008 Daniel A. Steffen <das@users.sourceforge.net>
*
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclMacOSXNotify.c,v 1.1.2.14 2007/08/11 03:12:07 das Exp $
+ * RCS: @(#) $Id: tclMacOSXNotify.c,v 1.1.2.15 2008/03/11 23:52:35 das Exp $
*/
#include "tclInt.h"
@@ -289,9 +289,8 @@ static void AtForkChild(void);
extern int pthread_atfork(void (*prepare)(void), void (*parent)(void),
void (*child)(void)) WEAK_IMPORT_ATTRIBUTE;
#endif /* HAVE_WEAK_IMPORT */
-#ifdef __LP64__
/*
- * On 64bit Darwin 9 and later, it is not possible to call CoreFoundation after
+ * On Darwin 9 and later, it is not possible to call CoreFoundation after
* a fork.
*/
#if !defined(MAC_OS_X_VERSION_MIN_REQUIRED) || \
@@ -301,9 +300,6 @@ MODULE_SCOPE long tclMacOSXDarwinRelease;
#else /* MAC_OS_X_VERSION_MIN_REQUIRED */
#define noCFafterFork 1
#endif /* MAC_OS_X_VERSION_MIN_REQUIRED */
-#else /* __LP64__ */
-#define noCFafterFork 0
-#endif /* __LP64__ */
#endif /* HAVE_PTHREAD_ATFORK */
/*