summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2010-07-02 22:31:50 (GMT)
committerdgp <dgp@users.sourceforge.net>2010-07-02 22:31:50 (GMT)
commitdb3c2b292ae73f39fb715d242d23e1135e6c27cf (patch)
treeb09a2a9d65b9bd14cdb90a5bccf2c74399b458e8
parentfc36414c7fe2d2d3d8bfa9a79a7390d0d30a80eb (diff)
downloadtcl-db3c2b292ae73f39fb715d242d23e1135e6c27cf.zip
tcl-db3c2b292ae73f39fb715d242d23e1135e6c27cf.tar.gz
tcl-db3c2b292ae73f39fb715d242d23e1135e6c27cf.tar.bz2
* generic/tclInt.decs: Reverted to the original TIP 337 implementation
on what to do with the obsolete internal stub for TclBackgroundException() (eliminate it!) * generic/tclIntDecls.h: make genstubs * generic/tclStubInit.c:
-rw-r--r--ChangeLog8
-rw-r--r--generic/tclInt.decls8
-rw-r--r--generic/tclIntDecls.h20
-rw-r--r--generic/tclStubInit.c4
4 files changed, 18 insertions, 22 deletions
diff --git a/ChangeLog b/ChangeLog
index 9327a6a..b2e6e9b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-07-02 Don Porter <dgp@users.sourceforge.net>
+
+ * generic/tclInt.decs: Reverted to the original TIP 337 implementation
+ on what to do with the obsolete internal stub for
+ TclBackgroundException() (eliminate it!)
+ * generic/tclIntDecls.h: make genstubs
+ * generic/tclStubInit.c:
+
2010-07-02 Jan Nijtmans <nijtmans@users.sf.net>
* generic/tclInt.decls [Bug #803489] Tcl_FindNamespace problem in the
diff --git a/generic/tclInt.decls b/generic/tclInt.decls
index 20f8b5b..d54d87c 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.146 2010/07/02 20:48:55 nijtmans Exp $
+# RCS: @(#) $Id: tclInt.decls,v 1.147 2010/07/02 22:31:50 dgp Exp $
library tcl
@@ -939,9 +939,9 @@ declare 235 generic {
# TIP 337 made this one public
-declare 236 generic {
- void TclBackgroundException(Tcl_Interp *interp, int code)
-}
+#declare 236 generic {
+# void TclBackgroundException(Tcl_Interp *interp, int code)
+#}
# TIP #285: Script cancellation support.
declare 237 generic {
diff --git a/generic/tclIntDecls.h b/generic/tclIntDecls.h
index 333e007..2ec3c63 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.139 2010/07/02 20:48:55 nijtmans Exp $
+ * RCS: @(#) $Id: tclIntDecls.h,v 1.140 2010/07/02 22:31:50 dgp Exp $
*/
#ifndef _TCLINTDECLS
@@ -984,11 +984,7 @@ EXTERN Var * TclVarHashCreateVar(TclVarHashTable *tablePtr,
EXTERN void TclInitVarHashTable(TclVarHashTable *tablePtr,
Namespace *nsPtr);
#endif
-#ifndef TclBackgroundException_TCL_DECLARED
-#define TclBackgroundException_TCL_DECLARED
-/* 236 */
-EXTERN void TclBackgroundException(Tcl_Interp *interp, int code);
-#endif
+/* Slot 236 is reserved */
#ifndef TclResetCancellation_TCL_DECLARED
#define TclResetCancellation_TCL_DECLARED
/* 237 */
@@ -1303,7 +1299,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 (*tclBackgroundException) (Tcl_Interp *interp, int code); /* 236 */
+ void *reserved236;
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 */
@@ -1990,10 +1986,7 @@ extern const TclIntStubs *tclIntStubsPtr;
#define TclInitVarHashTable \
(tclIntStubsPtr->tclInitVarHashTable) /* 235 */
#endif
-#ifndef TclBackgroundException
-#define TclBackgroundException \
- (tclIntStubsPtr->tclBackgroundException) /* 236 */
-#endif
+/* Slot 236 is reserved */
#ifndef TclResetCancellation
#define TclResetCancellation \
(tclIntStubsPtr->tclResetCancellation) /* 237 */
@@ -2050,9 +2043,4 @@ 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 d545af5..d687909 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.192 2010/07/02 20:48:55 nijtmans Exp $
+ * RCS: @(#) $Id: tclStubInit.c,v 1.193 2010/07/02 22:31:50 dgp Exp $
*/
#include "tclInt.h"
@@ -291,7 +291,7 @@ static const TclIntStubs tclIntStubs = {
TclGetSrcInfoForPc, /* 233 */
TclVarHashCreateVar, /* 234 */
TclInitVarHashTable, /* 235 */
- TclBackgroundException, /* 236 */
+ NULL, /* 236 */
TclResetCancellation, /* 237 */
TclNRInterpProc, /* 238 */
TclNRInterpProcCore, /* 239 */