diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | generic/tclDecls.h | 14 | ||||
-rw-r--r-- | generic/tclTest.c | 6 |
3 files changed, 21 insertions, 4 deletions
@@ -1,3 +1,8 @@ +2010-07-24 Jan Nijtmans <nijtmans@users.sf.net> + + * generic/tclDecls.h [Bug 3029891] Functions that don't belong in the + * generic/tclTest.c stub table. + 2010-07-16 Donal K. Fellows <dkf@users.sf.net> * generic/tclBasic.c: Added more errorCode setting. diff --git a/generic/tclDecls.h b/generic/tclDecls.h index f0bccc6..96e6a04 100644 --- a/generic/tclDecls.h +++ b/generic/tclDecls.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: tclDecls.h,v 1.177 2010/06/16 14:49:51 nijtmans Exp $ + * RCS: @(#) $Id: tclDecls.h,v 1.178 2010/07/24 06:39:52 nijtmans Exp $ */ #ifndef _TCLDECLS @@ -6926,5 +6926,17 @@ extern const TclStubs *tclStubsPtr; #undef TCL_STORAGE_CLASS #define TCL_STORAGE_CLASS DLLIMPORT +#if defined(USE_TCL_STUBS) +# undef Tcl_CreateInterp +# undef Tcl_FindExecutable +# undef Tcl_Init +# undef Tcl_SetVar +# undef Tcl_StaticPackage +# define Tcl_CreateInterp() (tclStubsPtr->tcl_CreateInterp()) +# define Tcl_Init(interp) (tclStubsPtr->tcl_Init(interp)) +# define Tcl_SetVar(interp, varName, newValue, flags) \ + (tclStubsPtr->tcl_SetVar(interp, varName, newValue, flags)) +#endif + #endif /* _TCLDECLS */ diff --git a/generic/tclTest.c b/generic/tclTest.c index bdc9b90..5c7dfbf 100644 --- a/generic/tclTest.c +++ b/generic/tclTest.c @@ -14,7 +14,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclTest.c,v 1.151 2010/04/20 14:24:34 nijtmans Exp $ + * RCS: @(#) $Id: tclTest.c,v 1.152 2010/07/24 06:39:52 nijtmans Exp $ */ #undef STATIC_BUILD @@ -4112,8 +4112,8 @@ TeststaticpkgCmd( if (Tcl_GetInt(interp, argv[3], &loaded) != TCL_OK) { return TCL_ERROR; } - Tcl_StaticPackage((loaded) ? interp : NULL, argv[1], StaticInitProc, - (safe) ? StaticInitProc : NULL); + tclStubsPtr->tcl_StaticPackage((loaded) ? interp : NULL, argv[1], + StaticInitProc, (safe) ? StaticInitProc : NULL); return TCL_OK; } |