summaryrefslogtreecommitdiffstats
path: root/unix/tclUnixNotfy.c
diff options
context:
space:
mode:
authordonal.k.fellows@manchester.ac.uk <dkf>2014-01-09 21:20:23 (GMT)
committerdonal.k.fellows@manchester.ac.uk <dkf>2014-01-09 21:20:23 (GMT)
commit4aa0402e774719d5bde6de666876df9607d61f62 (patch)
treefe3896fd636563de7504eb24bce205cf9f547457 /unix/tclUnixNotfy.c
parent8bf48ad5587163c9d5efb09245c0ff6d24db142a (diff)
parent1dd57e7f83b454f114c495ecec9d81fcfa8c13f6 (diff)
downloadtcl-4aa0402e774719d5bde6de666876df9607d61f62.zip
tcl-4aa0402e774719d5bde6de666876df9607d61f62.tar.gz
tcl-4aa0402e774719d5bde6de666876df9607d61f62.tar.bz2
merge trunk
Diffstat (limited to 'unix/tclUnixNotfy.c')
-rw-r--r--unix/tclUnixNotfy.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/unix/tclUnixNotfy.c b/unix/tclUnixNotfy.c
index c6c9759..b234667 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__) && !defined(__hpux)
static int atForkInit = 0;
static void AtForkPrepare(void);
static void AtForkParent(void);
@@ -290,7 +290,7 @@ Tcl_InitNotifier(void)
*/
Tcl_MutexLock(&notifierMutex);
-#ifdef HAVE_PTHREAD_ATFORK
+#if defined(HAVE_PTHREAD_ATFORK) && !defined(__APPLE__) && !defined(__hpux)
/*
* 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__) && !defined(__hpux)
/*
*----------------------------------------------------------------------
*