diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2013-10-07 14:25:21 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2013-10-07 14:25:21 (GMT) |
| commit | fb703e49177297d9c7ae9c6eb5bdaefe338838b2 (patch) | |
| tree | b2668ef918364195a157a42d38a1218cb8f86a20 | |
| parent | b64a70d3402ce6bbee1a32e8bb48e16144f3744d (diff) | |
| parent | 161caf6289109bf3b080433e64eb6597187e921a (diff) | |
| download | tcl-fb703e49177297d9c7ae9c6eb5bdaefe338838b2.zip tcl-fb703e49177297d9c7ae9c6eb5bdaefe338838b2.tar.gz tcl-fb703e49177297d9c7ae9c6eb5bdaefe338838b2.tar.bz2 | |
Fix for [d4e464ae48]: tcl 8.5.15/8.6.1 breaks python make check on darwin
| -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 c6c9759..254614f 100644 --- a/unix/tclUnixNotfy.c +++ b/unix/tclUnixNotfy.c @@ -194,7 +194,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); @@ -290,7 +290,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. @@ -304,7 +304,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 @@ -1313,7 +1313,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 b3e07a4..21a7bad 100644 --- a/unix/tclUnixTest.c +++ b/unix/tclUnixTest.c @@ -566,8 +566,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(); } |