diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2013-10-07 14:23:00 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2013-10-07 14:23:00 (GMT) |
| commit | 3ad87b0a02fb6b21734ab23688d769849e52bfe8 (patch) | |
| tree | bcf38ee5607b90b19574e0769147c00facfc98fb /unix | |
| parent | 7413854f340252d775aaa567031b23c54ea3917b (diff) | |
| parent | c83af8f8d46cbf0e5e98a6cc10c01ddbf5d979ab (diff) | |
| download | tcl-3ad87b0a02fb6b21734ab23688d769849e52bfe8.zip tcl-3ad87b0a02fb6b21734ab23688d769849e52bfe8.tar.gz tcl-3ad87b0a02fb6b21734ab23688d769849e52bfe8.tar.bz2 | |
Fix for [d4e464ae48]: tcl 8.5.15/8.6.1 breaks python make check on darwin
Diffstat (limited to 'unix')
| -rw-r--r-- | unix/tclUnixNotfy.c | 8 | ||||
| -rw-r--r-- | unix/tclUnixTest.c | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/unix/tclUnixNotfy.c b/unix/tclUnixNotfy.c index ec721ca..f41ef68 100644 --- a/unix/tclUnixNotfy.c +++ b/unix/tclUnixNotfy.c @@ -202,7 +202,7 @@ static Tcl_ThreadId notifierThread; #ifdef TCL_THREADS static void NotifierThreadProc(ClientData clientData); -#ifdef HAVE_PTHREAD_ATFORK +#if defined(HAVE_PTHREAD_ATFORK) && !defined(__APPLE__) static int atForkInit = 0; static void AtForkPrepare(void); static void AtForkParent(void); @@ -282,7 +282,7 @@ Tcl_InitNotifier(void) */ Tcl_MutexLock(¬ifierMutex); -#ifdef HAVE_PTHREAD_ATFORK +#if defined(HAVE_PTHREAD_ATFORK) && !defined(__APPLE__) /* * Install pthread_atfork handlers to reinitialize the notifier in the * child of a fork. @@ -296,7 +296,7 @@ Tcl_InitNotifier(void) } atForkInit = 1; } -#endif +#endif /* HAVE_PTHREAD_ATFORK */ /* * Check if my process id changed, e.g. I was forked * In this case, restart the notifier thread and close the @@ -1273,7 +1273,7 @@ NotifierThreadProc( TclpThreadExit (0); } -#ifdef HAVE_PTHREAD_ATFORK +#if defined(HAVE_PTHREAD_ATFORK) && !defined(__APPLE__) /* *---------------------------------------------------------------------- * diff --git a/unix/tclUnixTest.c b/unix/tclUnixTest.c index d2b729d..bb16f3b 100644 --- a/unix/tclUnixTest.c +++ b/unix/tclUnixTest.c @@ -574,8 +574,8 @@ TestforkObjCmd( "Cannot fork", NULL); return TCL_ERROR; } -#if !defined(HAVE_PTHREAD_ATFORK) || defined(MAC_OSX_TCL) - /* Only needed when pthread_atfork is not present or on OSX. */ +#if !defined(HAVE_PTHREAD_ATFORK) + /* Only needed when pthread_atfork is not present. */ if (pid==0) { Tcl_InitNotifier(); } |