From fc36414c7fe2d2d3d8bfa9a79a7390d0d30a80eb Mon Sep 17 00:00:00 2001 From: nijtmans Date: Fri, 2 Jul 2010 20:48:55 +0000 Subject: [Bug #803489] Tcl_FindNamespace problem in the Stubs table --- ChangeLog | 28 +++++++++++++++++----------- generic/tclInt.decls | 4 ++-- generic/tclIntDecls.h | 37 +++++++++++++++++++++++++++---------- generic/tclStubInit.c | 4 ++-- 4 files changed, 48 insertions(+), 25 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1f7d4aa..9327a6a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2010-07-02 Jan Nijtmans + + * generic/tclInt.decls [Bug #803489] Tcl_FindNamespace problem in the + * generic/tclIntDecls.h Stubs table + * generic/tclStubInit.c + 2010-07-02 Donal K. Fellows * generic/tclExecute.c (IllegalExprOperandType): [Bug 3024379]: Made @@ -7,17 +13,17 @@ 2010-07-01 Jan Nijtmans - * win/rules.vc: [Bug 3020677]: wish can't link reg1.2 - * tools/checkLibraryDoc.tcl: Formatting, spacing, cleanup unused - * tools/eolFix.tcl: variables no change in generated output. - * tools/fix_tommath_h.tcl: - * tools/genStubs.tcl: - * tools/index.tcl: - * tools/man2help2.tcl: - * tools/regexpTestLib.tcl: - * tools/tsdPerf.tcl: - * tools/uniClass.tcl: - * tools/uniParse.tcl: + * win/rules.vc [Bug #3020677] wish can't link reg1.2 + * tools/checkLibraryDoc.tcl formatting, spacing, cleanup unused variables + * tools/eolFix.tcl no change in generated output + * tools/fix_tommath_h.tcl + * tools/genStubs.tcl + * tools/index.tcl + * tools/man2help2.tcl + * tools/regexpTestLib.tcl + * tools/tsdPerf.tcl + * tools/uniClass.tcl + * tools/uniParse.tcl 2010-07-01 Donal K. Fellows diff --git a/generic/tclInt.decls b/generic/tclInt.decls index 79a68e1..20f8b5b 100644 --- a/generic/tclInt.decls +++ b/generic/tclInt.decls @@ -13,7 +13,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.decls,v 1.145 2010/03/20 15:39:46 dkf Exp $ +# RCS: @(#) $Id: tclInt.decls,v 1.146 2010/07/02 20:48:55 nijtmans Exp $ library tcl @@ -940,7 +940,7 @@ declare 235 generic { # TIP 337 made this one public declare 236 generic { - void Tcl_BackgroundException(Tcl_Interp *interp, int code) + void TclBackgroundException(Tcl_Interp *interp, int code) } # TIP #285: Script cancellation support. diff --git a/generic/tclIntDecls.h b/generic/tclIntDecls.h index 3797664..333e007 100644 --- a/generic/tclIntDecls.h +++ b/generic/tclIntDecls.h @@ -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: tclIntDecls.h,v 1.138 2010/03/20 15:40:13 dkf Exp $ + * RCS: @(#) $Id: tclIntDecls.h,v 1.139 2010/07/02 20:48:55 nijtmans Exp $ */ #ifndef _TCLINTDECLS @@ -30,8 +30,20 @@ # endif #endif -/* restore source compatibility for TIP #337 */ -#define TclBackgroundException Tcl_BackgroundException +/* [Bug #803489] Tcl_FindNamespace problem in the Stubs table */ +#undef Tcl_AppendExportList +#undef Tcl_CreateNamespace +#undef Tcl_DeleteNamespace +#undef Tcl_Export +#undef Tcl_FindCommand +#undef Tcl_FindNamespace +#undef Tcl_FindNamespaceVar +#undef Tcl_ForgetImport +#undef Tcl_GetCommandFromObj +#undef Tcl_GetCommandFullName +#undef Tcl_GetCurrentNamespace +#undef Tcl_GetGlobalNamespace +#undef Tcl_Import /* * WARNING: This file is automatically generated by the tools/genStubs.tcl @@ -972,10 +984,10 @@ EXTERN Var * TclVarHashCreateVar(TclVarHashTable *tablePtr, EXTERN void TclInitVarHashTable(TclVarHashTable *tablePtr, Namespace *nsPtr); #endif -#ifndef Tcl_BackgroundException_TCL_DECLARED -#define Tcl_BackgroundException_TCL_DECLARED +#ifndef TclBackgroundException_TCL_DECLARED +#define TclBackgroundException_TCL_DECLARED /* 236 */ -EXTERN void Tcl_BackgroundException(Tcl_Interp *interp, int code); +EXTERN void TclBackgroundException(Tcl_Interp *interp, int code); #endif #ifndef TclResetCancellation_TCL_DECLARED #define TclResetCancellation_TCL_DECLARED @@ -1291,7 +1303,7 @@ typedef struct TclIntStubs { void (*tclGetSrcInfoForPc) (CmdFrame *contextPtr); /* 233 */ Var * (*tclVarHashCreateVar) (TclVarHashTable *tablePtr, const char *key, int *newPtr); /* 234 */ void (*tclInitVarHashTable) (TclVarHashTable *tablePtr, Namespace *nsPtr); /* 235 */ - void (*tcl_BackgroundException) (Tcl_Interp *interp, int code); /* 236 */ + void (*tclBackgroundException) (Tcl_Interp *interp, int code); /* 236 */ int (*tclResetCancellation) (Tcl_Interp *interp, int force); /* 237 */ int (*tclNRInterpProc) (ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]); /* 238 */ int (*tclNRInterpProcCore) (Tcl_Interp *interp, Tcl_Obj *procNameObj, int skip, ProcErrorProc *errorProc); /* 239 */ @@ -1978,9 +1990,9 @@ extern const TclIntStubs *tclIntStubsPtr; #define TclInitVarHashTable \ (tclIntStubsPtr->tclInitVarHashTable) /* 235 */ #endif -#ifndef Tcl_BackgroundException -#define Tcl_BackgroundException \ - (tclIntStubsPtr->tcl_BackgroundException) /* 236 */ +#ifndef TclBackgroundException +#define TclBackgroundException \ + (tclIntStubsPtr->tclBackgroundException) /* 236 */ #endif #ifndef TclResetCancellation #define TclResetCancellation \ @@ -2038,4 +2050,9 @@ extern const TclIntStubs *tclIntStubsPtr; #undef TCL_STORAGE_CLASS #define TCL_STORAGE_CLASS DLLIMPORT +/* restore source compatibility for TIP #337 */ +#ifndef TclBackgroundException +# define TclBackgroundException Tcl_BackgroundException +#endif + #endif /* _TCLINTDECLS */ diff --git a/generic/tclStubInit.c b/generic/tclStubInit.c index d27f626..d545af5 100644 --- a/generic/tclStubInit.c +++ b/generic/tclStubInit.c @@ -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: tclStubInit.c,v 1.191 2010/04/26 13:32:33 dkf Exp $ + * RCS: @(#) $Id: tclStubInit.c,v 1.192 2010/07/02 20:48:55 nijtmans Exp $ */ #include "tclInt.h" @@ -291,7 +291,7 @@ static const TclIntStubs tclIntStubs = { TclGetSrcInfoForPc, /* 233 */ TclVarHashCreateVar, /* 234 */ TclInitVarHashTable, /* 235 */ - Tcl_BackgroundException, /* 236 */ + TclBackgroundException, /* 236 */ TclResetCancellation, /* 237 */ TclNRInterpProc, /* 238 */ TclNRInterpProcCore, /* 239 */ -- cgit v0.12