diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2013-10-08 11:58:49 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2013-10-08 11:58:49 (GMT) |
| commit | 6df4f8244c9c00c94ab72a50c0446b14b2f487c5 (patch) | |
| tree | e8a2f6fd623e37dcd67e3d628880f33a9ff45587 /unix | |
| parent | c68a9c8be3e79f9ba64c9b1b55773fb8defa3719 (diff) | |
| parent | fb703e49177297d9c7ae9c6eb5bdaefe338838b2 (diff) | |
| download | tcl-6df4f8244c9c00c94ab72a50c0446b14b2f487c5.zip tcl-6df4f8244c9c00c94ab72a50c0446b14b2f487c5.tar.gz tcl-6df4f8244c9c00c94ab72a50c0446b14b2f487c5.tar.bz2 | |
Merge trunk.
Remove obsolete lines in tclOO*Decls.h: TCL_STORAGE_CLASS is not used anywhere in "novem" any more.
Diffstat (limited to 'unix')
| -rw-r--r-- | unix/Makefile.in | 8 | ||||
| -rw-r--r-- | unix/tclUnixNotfy.c | 8 | ||||
| -rw-r--r-- | unix/tclUnixTest.c | 4 |
3 files changed, 13 insertions, 7 deletions
diff --git a/unix/Makefile.in b/unix/Makefile.in index c35538d..309e229 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -2076,6 +2076,9 @@ alldist: dist # build of this HTML documentation that has already been placed online. As # such, this rule is not guaranteed to work well on all systems; it only needs # to function on those of the Tcl/Tk maintainers. +# +# Also note that the 8.6 tool build requires an installed 8.6 native Tcl +# interpreter in order to be able to run. #-------------------------------------------------------------------------- html: ${NATIVE_TCLSH} @@ -2088,9 +2091,12 @@ html-tk: ${NATIVE_TCLSH} $(BUILD_HTML) --tk @EXTRA_BUILD_HTML@ +# You'd better have these programs or you will have problems creating Makefile +# from Makefile.in in the first place... +HTML_VERSION = `basename $(TOP_DIR) | sed s/tcl//` BUILD_HTML = \ @${NATIVE_TCLSH} $(TOOL_DIR)/tcltk-man2html.tcl \ - --htmldir="$(HTML_INSTALL_DIR)" \ + --useversion=$(HTML_VERSION) --htmldir="$(HTML_INSTALL_DIR)" \ --srcdir=$(TOP_DIR)/.. $(BUILD_HTML_FLAGS) #-------------------------------------------------------------------------- diff --git a/unix/tclUnixNotfy.c b/unix/tclUnixNotfy.c index 7b9436a..24a3529 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 021e0f6..68ec8d3 100644 --- a/unix/tclUnixTest.c +++ b/unix/tclUnixTest.c @@ -572,8 +572,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(); } |