diff options
| author | dgp <dgp@users.sourceforge.net> | 2024-02-14 18:55:29 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2024-02-14 18:55:29 (GMT) |
| commit | e3af76a7e7ddc539c98b7799c4ddab51822c27d3 (patch) | |
| tree | 2334f3fbc63ed4c2df90cd9f4c39193f6c9f82c0 | |
| parent | 9ba9faaf0793fc322bef2bd6145f75f7d46b5338 (diff) | |
| parent | 6e1b2262d9d1d4a4bbd41e751259ec4325cdd61b (diff) | |
| download | tcl-e3af76a7e7ddc539c98b7799c4ddab51822c27d3.zip tcl-e3af76a7e7ddc539c98b7799c4ddab51822c27d3.tar.gz tcl-e3af76a7e7ddc539c98b7799c4ddab51822c27d3.tar.bz2 | |
merge 8.6
| -rw-r--r-- | generic/tclIO.c | 2 | ||||
| -rw-r--r-- | library/opt/optparse.tcl | 2 | ||||
| -rw-r--r-- | library/opt/pkgIndex.tcl | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/generic/tclIO.c b/generic/tclIO.c index b8a79c2..349df68 100644 --- a/generic/tclIO.c +++ b/generic/tclIO.c @@ -9227,7 +9227,7 @@ TclCopyChannel( * completed. */ - csPtr = (CopyState *)ckalloc(offsetof(CopyState, buffer) + 1U + !moveBytes * inStatePtr->bufSize); + csPtr = (CopyState *)ckalloc(TclOffset(CopyState, buffer) + 1U + !moveBytes * inStatePtr->bufSize); csPtr->bufSize = !moveBytes * inStatePtr->bufSize; csPtr->readPtr = inPtr; csPtr->writePtr = outPtr; diff --git a/library/opt/optparse.tcl b/library/opt/optparse.tcl index 914ceff..0a6cdfa 100644 --- a/library/opt/optparse.tcl +++ b/library/opt/optparse.tcl @@ -11,7 +11,7 @@ package require Tcl 8.5- # When this version number changes, update the pkgIndex.tcl file # and the install directory in the Makefiles. -package provide opt 0.4.8 +package provide opt 0.4.9 namespace eval ::tcl { diff --git a/library/opt/pkgIndex.tcl b/library/opt/pkgIndex.tcl index 23e118c..c763a3d 100644 --- a/library/opt/pkgIndex.tcl +++ b/library/opt/pkgIndex.tcl @@ -9,4 +9,4 @@ # full path name of this file's directory. if {![package vsatisfies [package provide Tcl] 8.5-]} {return} -package ifneeded opt 0.4.8 [list source [file join $dir optparse.tcl]] +package ifneeded opt 0.4.9 [list source [file join $dir optparse.tcl]] |