diff options
| author | dgp <dgp@users.sourceforge.net> | 2016-01-29 14:22:31 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2016-01-29 14:22:31 (GMT) |
| commit | d8d1e6bbf527a1eb861879704f7779b5ac36781a (patch) | |
| tree | 506264f185f1facf6e0737d9a1bb4a9a3716798c /generic | |
| parent | a1db6470b525c61a75fc26133b821ca98d6c66df (diff) | |
| parent | 2f90de6166e0253955f4e7ce895ddb63c0d4f05d (diff) | |
| download | tcl-d8d1e6bbf527a1eb861879704f7779b5ac36781a.zip tcl-d8d1e6bbf527a1eb861879704f7779b5ac36781a.tar.gz tcl-d8d1e6bbf527a1eb861879704f7779b5ac36781a.tar.bz2 | |
merge trunk
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tclBasic.c | 7 | ||||
| -rw-r--r-- | generic/tclTest.c | 6 |
2 files changed, 10 insertions, 3 deletions
diff --git a/generic/tclBasic.c b/generic/tclBasic.c index 5c5bc64..e5d7406 100644 --- a/generic/tclBasic.c +++ b/generic/tclBasic.c @@ -916,6 +916,13 @@ Tcl_CreateInterp(void) TclInitEmbeddedConfigurationInformation(interp); /* + * TIP #440: Declare the name of the script engine to be "Tcl". + */ + + Tcl_SetVar2(interp, "tcl_platform", "engine", "Tcl", + TCL_GLOBAL_ONLY); + + /* * Compute the byte order of this machine. */ diff --git a/generic/tclTest.c b/generic/tclTest.c index 63a6740..9794f59 100644 --- a/generic/tclTest.c +++ b/generic/tclTest.c @@ -6872,9 +6872,9 @@ NREUnwind_callback( &none, NULL); } else { Tcl_Obj *idata[3]; - idata[0] = Tcl_NewIntObj((int) (data[1] - data[0])); - idata[1] = Tcl_NewIntObj((int) (data[2] - data[0])); - idata[2] = Tcl_NewIntObj((int) ((void *) &none - data[0])); + idata[0] = Tcl_NewIntObj((int) ((char *) data[1] - (char *) data[0])); + idata[1] = Tcl_NewIntObj((int) ((char *) data[2] - (char *) data[0])); + idata[2] = Tcl_NewIntObj((int) ((char *) &none - (char *) data[0])); Tcl_SetObjResult(interp, Tcl_NewListObj(3, idata)); } return TCL_OK; |