From c42fcde9e93845b5883b6be8dd4f24a8d5b0b742 Mon Sep 17 00:00:00 2001 From: nijtmans Date: Tue, 9 Dec 2008 21:47:08 +0000 Subject: restore source and binary compatibility for TIP #337 implementation. (when it's _that_ simple, there is no excuse not to do it) :-) --- ChangeLog | 8 ++++++++ generic/tclInt.decls | 8 ++++---- generic/tclIntDecls.h | 19 +++++++++++++++---- generic/tclStubInit.c | 4 ++-- 4 files changed, 29 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 41a3132..13455f0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2008-12-09 Jan Nijtmans + + * generic/tclInt.decls: restore source and binary compatibility + for TIP #337 implementation. (when it's _that_ + simple, there is no excuse not to do it) :-) + * generic/tclIntDecls.h: make genstubs + * generic/tclStubInit.c: + 2008-12-09 Don Porter TIP #337 IMPLEMENTATION diff --git a/generic/tclInt.decls b/generic/tclInt.decls index 1853c5c..bdc71ad 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.130 2008/12/09 20:16:29 dgp Exp $ +# RCS: @(#) $Id: tclInt.decls,v 1.131 2008/12/09 21:47:08 nijtmans Exp $ library tcl @@ -934,9 +934,9 @@ declare 235 generic { # TIP 337 made this one public -#declare 236 generic { -# void TclBackgroundException(Tcl_Interp *interp, int code) -#} +declare 236 generic { + void Tcl_BackgroundException(Tcl_Interp *interp, int code) +} # TIP #285: Script cancellation support. declare 237 generic { diff --git a/generic/tclIntDecls.h b/generic/tclIntDecls.h index a511988..b2f45b1 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.126 2008/12/09 20:16:30 dgp Exp $ + * RCS: @(#) $Id: tclIntDecls.h,v 1.127 2008/12/09 21:47:08 nijtmans Exp $ */ #ifndef _TCLINTDECLS @@ -30,6 +30,9 @@ # endif #endif +/* restore source compatibility for TIP #337 */ +#define TclBackgroundException Tcl_BackgroundException + /* * WARNING: This file is automatically generated by the tools/genStubs.tcl * script. Any modifications to the function declarations below should be made @@ -1059,7 +1062,12 @@ EXTERN Var * TclVarHashCreateVar (TclVarHashTable * tablePtr, EXTERN void TclInitVarHashTable (TclVarHashTable * tablePtr, Namespace * nsPtr); #endif -/* Slot 236 is reserved */ +#ifndef Tcl_BackgroundException_TCL_DECLARED +#define Tcl_BackgroundException_TCL_DECLARED +/* 236 */ +EXTERN void Tcl_BackgroundException (Tcl_Interp * interp, + int code); +#endif #ifndef TclResetCancellation_TCL_DECLARED #define TclResetCancellation_TCL_DECLARED /* 237 */ @@ -1364,7 +1372,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 *reserved236; + void (*tcl_BackgroundException) (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 */ @@ -2105,7 +2113,10 @@ extern const TclIntStubs *tclIntStubsPtr; #define TclInitVarHashTable \ (tclIntStubsPtr->tclInitVarHashTable) /* 235 */ #endif -/* Slot 236 is reserved */ +#ifndef Tcl_BackgroundException +#define Tcl_BackgroundException \ + (tclIntStubsPtr->tcl_BackgroundException) /* 236 */ +#endif #ifndef TclResetCancellation #define TclResetCancellation \ (tclIntStubsPtr->tclResetCancellation) /* 237 */ diff --git a/generic/tclStubInit.c b/generic/tclStubInit.c index f858b14..b5ea1b6 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.171 2008/12/09 20:16:30 dgp Exp $ + * RCS: @(#) $Id: tclStubInit.c,v 1.172 2008/12/09 21:47:08 nijtmans Exp $ */ #include "tclInt.h" @@ -305,7 +305,7 @@ static const TclIntStubs tclIntStubs = { TclGetSrcInfoForPc, /* 233 */ TclVarHashCreateVar, /* 234 */ TclInitVarHashTable, /* 235 */ - NULL, /* 236 */ + Tcl_BackgroundException, /* 236 */ TclResetCancellation, /* 237 */ TclNRInterpProc, /* 238 */ TclNRInterpProcCore, /* 239 */ -- cgit v0.12