From eee7eab0e7b0dc4de7075e8ff5593216a2660bb0 Mon Sep 17 00:00:00 2001 From: dgp Date: Fri, 25 Mar 2005 00:35:02 +0000 Subject: * generic/tclCompile.h: Move the TclInterpReady() declaration from * generic/tclInt.h: tclCompile.h to tclInt.h. Should have been done as part of the 1115904 bug fix on 2005-03-18. * generic/tclThreadTest.c: Stop providing the phony package "Thread 1.0" when the [::testthread] command is defined. It's never used by anything, and conflicts with loading the real "Thread" package. --- ChangeLog | 11 +++++++++++ generic/tclCompile.h | 4 +--- generic/tclInt.h | 3 ++- generic/tclThreadTest.c | 5 +---- 4 files changed, 15 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index e7c7bc6..25da4c5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2005-03-24 Don Porter + + * generic/tclCompile.h: Move the TclInterpReady() declaration from + * generic/tclInt.h: tclCompile.h to tclInt.h. Should have + been done as part of the 1115904 bug fix on 2005-03-18. + + * generic/tclThreadTest.c: Stop providing the phony package + "Thread 1.0" when the [::testthread] command is defined. It's + never used by anything, and conflicts with loading the real + "Thread" package. + 2005-03-18 Don Porter * generic/tclCompCmds.c (TclCompileIncrCmd): Corrected checks diff --git a/generic/tclCompile.h b/generic/tclCompile.h index ae4c39c..896b385 100644 --- a/generic/tclCompile.h +++ b/generic/tclCompile.h @@ -8,7 +8,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclCompile.h,v 1.53 2004/12/24 18:06:58 msofer Exp $ + * RCS: @(#) $Id: tclCompile.h,v 1.54 2005/03/25 00:35:03 dgp Exp $ */ #ifndef _TCLCOMPILATION @@ -748,8 +748,6 @@ MODULE_SCOPE AuxDataType tclForeachInfoType; MODULE_SCOPE int TclEvalObjvInternal _ANSI_ARGS_((Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[], CONST char *command, int length, int flags)); -MODULE_SCOPE int TclInterpReady _ANSI_ARGS_((Tcl_Interp *interp)); - /* *---------------------------------------------------------------- diff --git a/generic/tclInt.h b/generic/tclInt.h index 21cd333..9ba94e5 100644 --- a/generic/tclInt.h +++ b/generic/tclInt.h @@ -12,7 +12,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclInt.h,v 1.215 2005/03/10 22:10:38 dgp Exp $ + * RCS: @(#) $Id: tclInt.h,v 1.216 2005/03/25 00:35:03 dgp Exp $ */ #ifndef _TCLINT @@ -1889,6 +1889,7 @@ MODULE_SCOPE void TclInitNamespaceSubsystem _ANSI_ARGS_((void)); MODULE_SCOPE void TclInitNotifier _ANSI_ARGS_((void)); MODULE_SCOPE void TclInitObjSubsystem _ANSI_ARGS_((void)); MODULE_SCOPE void TclInitSubsystems (); +MODULE_SCOPE int TclInterpReady _ANSI_ARGS_((Tcl_Interp *interp)); MODULE_SCOPE int TclIsLocalScalar _ANSI_ARGS_((CONST char *src, int len)); MODULE_SCOPE int TclJoinThread _ANSI_ARGS_((Tcl_ThreadId id, diff --git a/generic/tclThreadTest.c b/generic/tclThreadTest.c index 7ea39dc..7b2ac56 100644 --- a/generic/tclThreadTest.c +++ b/generic/tclThreadTest.c @@ -11,7 +11,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclThreadTest.c,v 1.17 2004/10/20 05:28:39 dgp Exp $ + * RCS: @(#) $Id: tclThreadTest.c,v 1.18 2005/03/25 00:35:03 dgp Exp $ */ #include "tclInt.h" @@ -160,9 +160,6 @@ TclThread_Init(interp) Tcl_CreateObjCommand(interp,"testthread", Tcl_ThreadObjCmd, (ClientData)NULL ,NULL); - if (Tcl_PkgProvide(interp, "Thread", "1.0" ) != TCL_OK) { - return TCL_ERROR; - } return TCL_OK; } -- cgit v0.12