diff options
| author | donal.k.fellows@manchester.ac.uk <dkf> | 2013-10-20 18:44:22 (GMT) |
|---|---|---|
| committer | donal.k.fellows@manchester.ac.uk <dkf> | 2013-10-20 18:44:22 (GMT) |
| commit | f751ffde0f8b39b7843809d0412e738aac85156e (patch) | |
| tree | a54217a116100c7326fa1745091bea13b3727a0b /unix/tclUnixNotfy.c | |
| parent | d6b54e06c210aef29df1c9b2ad08105d213cf98f (diff) | |
| parent | 1fb998dc1d63f2da1b612b56ab6f68e22ab7b3ff (diff) | |
| download | tcl-f751ffde0f8b39b7843809d0412e738aac85156e.zip tcl-f751ffde0f8b39b7843809d0412e738aac85156e.tar.gz tcl-f751ffde0f8b39b7843809d0412e738aac85156e.tar.bz2 | |
merge trunk
Diffstat (limited to 'unix/tclUnixNotfy.c')
| -rw-r--r-- | unix/tclUnixNotfy.c | 8 |
1 files changed, 4 insertions, 4 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__) /* *---------------------------------------------------------------------- * |