diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2016-01-22 10:56:45 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2016-01-22 10:56:45 (GMT) |
| commit | a28225db2f4c68dab83295f7b8ceadba69f9e5b3 (patch) | |
| tree | 30ef62213e3e020cd16f4721d483b15361fc7784 /generic | |
| parent | 3edd7f9d781b262da777af877c5f15ca18870877 (diff) | |
| parent | 64d35cac9591025ab8c2423b56e7e180779ef923 (diff) | |
| download | tcl-a28225db2f4c68dab83295f7b8ceadba69f9e5b3.zip tcl-a28225db2f4c68dab83295f7b8ceadba69f9e5b3.tar.gz tcl-a28225db2f4c68dab83295f7b8ceadba69f9e5b3.tar.bz2 | |
Merge trunk. Simplify build information to "+core.<UUID>"
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tclBasic.c | 4 | ||||
| -rw-r--r-- | generic/tclInterp.c | 1 | ||||
| -rw-r--r-- | generic/tclPkg.c | 2 | ||||
| -rw-r--r-- | generic/tclThreadTest.c | 4 |
4 files changed, 6 insertions, 5 deletions
diff --git a/generic/tclBasic.c b/generic/tclBasic.c index 7f04329..905ccec 100644 --- a/generic/tclBasic.c +++ b/generic/tclBasic.c @@ -959,9 +959,11 @@ Tcl_CreateInterp(void) /* * Register Tcl's version number. * TIP #268: Full patchlevel instead of just major.minor + * TIP #339: Append build information "+core.<UUID>" */ - Tcl_PkgProvideEx(interp, "Tcl", TCL_PATCH_LEVEL "+core.tcl.tk." STRINGIFY(TCL_VERSION_UUID), &tclStubs); + Tcl_PkgProvideEx(interp, "Tcl", TCL_PATCH_LEVEL "+core." + STRINGIFY(TCL_VERSION_UUID), &tclStubs); if (TclTommath_Init(interp) != TCL_OK) { Tcl_Panic("%s", Tcl_GetString(Tcl_GetObjResult(interp))); diff --git a/generic/tclInterp.c b/generic/tclInterp.c index 9d2ad6c..9c301a9 100644 --- a/generic/tclInterp.c +++ b/generic/tclInterp.c @@ -1883,7 +1883,6 @@ AliasObjCmd( cmdv = TclStackAlloc(interp, cmdc * sizeof(Tcl_Obj *)); } - prefv = &aliasPtr->objPtr; memcpy(cmdv, prefv, (size_t) (prefc * sizeof(Tcl_Obj *))); memcpy(cmdv+prefc, objv+1, (size_t) ((objc-1) * sizeof(Tcl_Obj *))); diff --git a/generic/tclPkg.c b/generic/tclPkg.c index dcf7c3b..539b357 100644 --- a/generic/tclPkg.c +++ b/generic/tclPkg.c @@ -1300,7 +1300,7 @@ CheckVersionAndConvert( * (4) Only one of 'a' or 'b' may occur. * (5) Neither 'a', nor 'b' may occur before or after a '.' * - * TIP ???, Modified rules + * TIP 439, Modified rules * In stead of "a" and "b" in the above rules, the longer * forms "-alpha." and "-beta." are accepted as well */ diff --git a/generic/tclThreadTest.c b/generic/tclThreadTest.c index 75f8a15..9c66313 100644 --- a/generic/tclThreadTest.c +++ b/generic/tclThreadTest.c @@ -834,7 +834,7 @@ ThreadSend( if (threadId == Tcl_GetCurrentThread()) { Tcl_MutexUnlock(&threadMutex); - return Tcl_EvalEx(interp, script,-1,TCL_EVAL_GLOBAL); + return Tcl_EvalEx(interp, script,-1,TCL_EVAL_GLOBAL); } /* @@ -1029,7 +1029,7 @@ ThreadEventProc( Tcl_Preserve(interp); Tcl_ResetResult(interp); Tcl_CreateThreadExitHandler(ThreadFreeProc, threadEventPtr->script); - code = Tcl_EvalEx(interp, threadEventPtr->script,-1,TCL_EVAL_GLOBAL); + code = Tcl_EvalEx(interp, threadEventPtr->script,-1,TCL_EVAL_GLOBAL); Tcl_DeleteThreadExitHandler(ThreadFreeProc, threadEventPtr->script); if (code != TCL_OK) { errorCode = Tcl_GetVar(interp, "errorCode", TCL_GLOBAL_ONLY); |