Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Add dummy (undocumented) TclCanceled function in stub table (not exported as symbol or macro), which always returns TCL_OK. Needed for Tk 8.5.14 when running in Tcl 8.6 for properly clean-up when a (Tcl 8.6) thread is canceled. |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | core-8-5-branch |
Files: | files | file ages | folders |
SHA1: |
6a9ee3273c57711e9762a626ef2bf525 |
User & Date: | jan.nijtmans 2013-03-27 14:06:03 |
References
2013-03-28
| ||
14:48 | Undo [6a9ee3273c]. Last commit in Tk's core-8-5-branch makes this change no longer necessary. check-in: 12f98a9528 user: jan.nijtmans tags: core-8-5-branch | |
Context
2013-03-28
| ||
14:48 | Undo [6a9ee3273c]. Last commit in Tk's core-8-5-branch makes this change no longer necessary. check-in: 12f98a9528 user: jan.nijtmans tags: core-8-5-branch | |
2013-03-27
| ||
14:13 | merge-mark check-in: 6a633181a3 user: jan.nijtmans tags: trunk | |
14:06 | Add dummy (undocumented) TclCanceled function in stub table (not exported as symbol or macro), which... check-in: 6a9ee3273c user: jan.nijtmans tags: core-8-5-branch | |
10:48 | remove unneccessary duplication check-in: 1d94413d32 user: jan.nijtmans tags: core-8-5-branch | |
Changes
Changes to generic/tcl.decls.
︙ | ︙ | |||
2104 2105 2106 2107 2108 2109 2110 2111 2112 2113 2114 2115 2116 2117 | } declare 578 { Tcl_Obj *Tcl_ObjPrintf(const char *format, ...) } declare 579 { void Tcl_AppendPrintfToObj(Tcl_Obj *objPtr, const char *format, ...) } declare 630 { void TclUnusedStubEntry(void) } ############################################################################## # Define the platform specific public Tcl interface. These functions are only | > > > > > | 2104 2105 2106 2107 2108 2109 2110 2111 2112 2113 2114 2115 2116 2117 2118 2119 2120 2121 2122 | } declare 578 { Tcl_Obj *Tcl_ObjPrintf(const char *format, ...) } declare 579 { void Tcl_AppendPrintfToObj(Tcl_Obj *objPtr, const char *format, ...) } # Public in Tcl 8.6: declare 581 { int TclCanceled(Tcl_Interp *interp, int flags) } declare 630 { void TclUnusedStubEntry(void) } ############################################################################## # Define the platform specific public Tcl interface. These functions are only |
︙ | ︙ |
Changes to generic/tclDecls.h.
︙ | ︙ | |||
3405 3406 3407 3408 3409 3410 3411 | #ifndef Tcl_AppendPrintfToObj_TCL_DECLARED #define Tcl_AppendPrintfToObj_TCL_DECLARED /* 579 */ EXTERN void Tcl_AppendPrintfToObj(Tcl_Obj *objPtr, CONST char *format, ...); #endif /* Slot 580 is reserved */ | > > | > > | 3405 3406 3407 3408 3409 3410 3411 3412 3413 3414 3415 3416 3417 3418 3419 3420 3421 3422 3423 | #ifndef Tcl_AppendPrintfToObj_TCL_DECLARED #define Tcl_AppendPrintfToObj_TCL_DECLARED /* 579 */ EXTERN void Tcl_AppendPrintfToObj(Tcl_Obj *objPtr, CONST char *format, ...); #endif /* Slot 580 is reserved */ #ifndef TclCanceled_TCL_DECLARED #define TclCanceled_TCL_DECLARED /* 581 */ EXTERN int TclCanceled(Tcl_Interp *interp, int flags); #endif /* Slot 582 is reserved */ /* Slot 583 is reserved */ /* Slot 584 is reserved */ /* Slot 585 is reserved */ /* Slot 586 is reserved */ /* Slot 587 is reserved */ /* Slot 588 is reserved */ |
︙ | ︙ | |||
4075 4076 4077 4078 4079 4080 4081 | void (*tcl_AppendObjToErrorInfo) (Tcl_Interp *interp, Tcl_Obj *objPtr); /* 574 */ void (*tcl_AppendLimitedToObj) (Tcl_Obj *objPtr, CONST char *bytes, int length, int limit, CONST char *ellipsis); /* 575 */ Tcl_Obj * (*tcl_Format) (Tcl_Interp *interp, CONST char *format, int objc, Tcl_Obj *CONST objv[]); /* 576 */ int (*tcl_AppendFormatToObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, CONST char *format, int objc, Tcl_Obj *CONST objv[]); /* 577 */ Tcl_Obj * (*tcl_ObjPrintf) (CONST char *format, ...); /* 578 */ void (*tcl_AppendPrintfToObj) (Tcl_Obj *objPtr, CONST char *format, ...); /* 579 */ VOID *reserved580; | | | 4079 4080 4081 4082 4083 4084 4085 4086 4087 4088 4089 4090 4091 4092 4093 | void (*tcl_AppendObjToErrorInfo) (Tcl_Interp *interp, Tcl_Obj *objPtr); /* 574 */ void (*tcl_AppendLimitedToObj) (Tcl_Obj *objPtr, CONST char *bytes, int length, int limit, CONST char *ellipsis); /* 575 */ Tcl_Obj * (*tcl_Format) (Tcl_Interp *interp, CONST char *format, int objc, Tcl_Obj *CONST objv[]); /* 576 */ int (*tcl_AppendFormatToObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, CONST char *format, int objc, Tcl_Obj *CONST objv[]); /* 577 */ Tcl_Obj * (*tcl_ObjPrintf) (CONST char *format, ...); /* 578 */ void (*tcl_AppendPrintfToObj) (Tcl_Obj *objPtr, CONST char *format, ...); /* 579 */ VOID *reserved580; int (*tclCanceled) (Tcl_Interp *interp, int flags); /* 581 */ VOID *reserved582; VOID *reserved583; VOID *reserved584; VOID *reserved585; VOID *reserved586; VOID *reserved587; VOID *reserved588; |
︙ | ︙ | |||
6480 6481 6482 6483 6484 6485 6486 | (tclStubsPtr->tcl_ObjPrintf) /* 578 */ #endif #ifndef Tcl_AppendPrintfToObj #define Tcl_AppendPrintfToObj \ (tclStubsPtr->tcl_AppendPrintfToObj) /* 579 */ #endif /* Slot 580 is reserved */ | > | > > | 6484 6485 6486 6487 6488 6489 6490 6491 6492 6493 6494 6495 6496 6497 6498 6499 6500 6501 | (tclStubsPtr->tcl_ObjPrintf) /* 578 */ #endif #ifndef Tcl_AppendPrintfToObj #define Tcl_AppendPrintfToObj \ (tclStubsPtr->tcl_AppendPrintfToObj) /* 579 */ #endif /* Slot 580 is reserved */ #ifndef TclCanceled #define TclCanceled \ (tclStubsPtr->tclCanceled) /* 581 */ #endif /* Slot 582 is reserved */ /* Slot 583 is reserved */ /* Slot 584 is reserved */ /* Slot 585 is reserved */ /* Slot 586 is reserved */ /* Slot 587 is reserved */ /* Slot 588 is reserved */ |
︙ | ︙ | |||
6538 6539 6540 6541 6542 6543 6544 6545 6546 6547 6548 6549 6550 6551 | (tclStubsPtr->tclUnusedStubEntry) /* 630 */ #endif #endif /* defined(USE_TCL_STUBS) && !defined(USE_TCL_STUB_PROCS) */ /* !END!: Do not edit above this line. */ #undef TclUnusedStubEntry #undef TCL_STORAGE_CLASS #define TCL_STORAGE_CLASS DLLIMPORT /* * Deprecated Tcl procedures: | > | 6545 6546 6547 6548 6549 6550 6551 6552 6553 6554 6555 6556 6557 6558 6559 | (tclStubsPtr->tclUnusedStubEntry) /* 630 */ #endif #endif /* defined(USE_TCL_STUBS) && !defined(USE_TCL_STUB_PROCS) */ /* !END!: Do not edit above this line. */ #undef TclCanceled #undef TclUnusedStubEntry #undef TCL_STORAGE_CLASS #define TCL_STORAGE_CLASS DLLIMPORT /* * Deprecated Tcl procedures: |
︙ | ︙ |
Changes to generic/tclStubInit.c.
︙ | ︙ | |||
71 72 73 74 75 76 77 78 79 80 81 82 83 84 | #endif MODULE_SCOPE TclIntStubs tclIntStubs; MODULE_SCOPE TclIntPlatStubs tclIntPlatStubs; MODULE_SCOPE TclPlatStubs tclPlatStubs; MODULE_SCOPE TclStubs tclStubs; MODULE_SCOPE TclTomMathStubs tclTomMathStubs; #if defined(_WIN32) || defined(__CYGWIN__) #undef TclWinNToHS unsigned short TclWinNToHS(unsigned short ns) { return ntohs(ns); } #endif | > > > > > > > | 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 | #endif MODULE_SCOPE TclIntStubs tclIntStubs; MODULE_SCOPE TclIntPlatStubs tclIntPlatStubs; MODULE_SCOPE TclPlatStubs tclPlatStubs; MODULE_SCOPE TclStubs tclStubs; MODULE_SCOPE TclTomMathStubs tclTomMathStubs; #define TclCanceled canceled static int TclCanceled(interp) Tcl_Interp *interp; { return TCL_OK; } #if defined(_WIN32) || defined(__CYGWIN__) #undef TclWinNToHS unsigned short TclWinNToHS(unsigned short ns) { return ntohs(ns); } #endif |
︙ | ︙ | |||
1252 1253 1254 1255 1256 1257 1258 | Tcl_AppendObjToErrorInfo, /* 574 */ Tcl_AppendLimitedToObj, /* 575 */ Tcl_Format, /* 576 */ Tcl_AppendFormatToObj, /* 577 */ Tcl_ObjPrintf, /* 578 */ Tcl_AppendPrintfToObj, /* 579 */ NULL, /* 580 */ | | | 1259 1260 1261 1262 1263 1264 1265 1266 1267 1268 1269 1270 1271 1272 1273 | Tcl_AppendObjToErrorInfo, /* 574 */ Tcl_AppendLimitedToObj, /* 575 */ Tcl_Format, /* 576 */ Tcl_AppendFormatToObj, /* 577 */ Tcl_ObjPrintf, /* 578 */ Tcl_AppendPrintfToObj, /* 579 */ NULL, /* 580 */ TclCanceled, /* 581 */ NULL, /* 582 */ NULL, /* 583 */ NULL, /* 584 */ NULL, /* 585 */ NULL, /* 586 */ NULL, /* 587 */ NULL, /* 588 */ |
︙ | ︙ |