summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin B Kenny <kennykb@acm.org>2009-11-27 21:44:01 (GMT)
committerKevin B Kenny <kennykb@acm.org>2009-11-27 21:44:01 (GMT)
commitd8b589ccb61ee3efe3554992135b24a44cad07c3 (patch)
tree4d28a9c171ff5f21516cbbbdbc0d75968bb83ddf
parent8c5ade5b276e02962ef5855e6bd777685ab8791f (diff)
downloadtcl-d8b589ccb61ee3efe3554992135b24a44cad07c3.zip
tcl-d8b589ccb61ee3efe3554992135b24a44cad07c3.tar.gz
tcl-d8b589ccb61ee3efe3554992135b24a44cad07c3.tar.bz2
* win/tclAppInit.c (Tcl_AppInit): Reverted Jan's change that added
a call to Tcl_InitStubs. 'tclsh' and 'tcltest' are providers, not consumers of the Stubs table, and should not link with the Stubs library, but only with the main Tcl library. (In any case, the presence of Tcl_InitStubs broke the build.) [Bug 2902965]
-rw-r--r--ChangeLog8
-rw-r--r--win/tclAppInit.c6
2 files changed, 9 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 3b13c8f..9399af2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2009-11-27 Kevin B. Kenny <kennykb@acm.org>
+
+ * win/tclAppInit.c (Tcl_AppInit): Reverted Jan's change that added
+ a call to Tcl_InitStubs. 'tclsh' and 'tcltest' are providers, not
+ consumers of the Stubs table, and should not link with the Stubs
+ library, but only with the main Tcl library. (In any case, the
+ presence of Tcl_InitStubs broke the build.) [Bug 2902965]
+
2009-11-27 Donal K. Fellows <dkf@users.sf.net>
* doc/BoolObj.3, doc/Class.3, doc/CrtChannel.3, doc/DictObj.3:
diff --git a/win/tclAppInit.c b/win/tclAppInit.c
index 9b7a3e9..1f90610 100644
--- a/win/tclAppInit.c
+++ b/win/tclAppInit.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: tclAppInit.c,v 1.29 2009/11/26 07:01:51 nijtmans Exp $
+ * RCS: @(#) $Id: tclAppInit.c,v 1.30 2009/11/27 21:44:01 kennykb Exp $
*/
#include "tcl.h"
@@ -125,10 +125,6 @@ int
Tcl_AppInit(
Tcl_Interp *interp) /* Interpreter for application. */
{
-#undef Tcl_InitStubs
- if (!Tcl_InitStubs(interp, TCL_VERSION, 0)) {
- return TCL_ERROR;
- }
if (Tcl_Init(interp) == TCL_ERROR) {
return TCL_ERROR;
}