diff options
| author | andreas_kupries <akupries@shaw.ca> | 2008-05-23 21:00:42 (GMT) |
|---|---|---|
| committer | andreas_kupries <akupries@shaw.ca> | 2008-05-23 21:00:42 (GMT) |
| commit | 330add62d15d66049d37d4e23a769b78074d15ab (patch) | |
| tree | 790b682b0a84cd68f66fcb8593ecfeb7cd290440 /win | |
| parent | 0cc498df8a623e2490e79096ec68eb60a01a2c2b (diff) | |
| download | tcl-330add62d15d66049d37d4e23a769b78074d15ab.zip tcl-330add62d15d66049d37d4e23a769b78074d15ab.tar.gz tcl-330add62d15d66049d37d4e23a769b78074d15ab.tar.bz2 | |
* win/tclWinChan.c (FileWideSeekProc): Accepted a patch by
Alexandre Ferrieux <ferrieux@users.sourceforge.net> to fix the
[Bug 1965787]. 'tell' now works for locations > 2 GB as well
instead of going negative.
* generic/tclIO.c (Tcl_SetChannelBufferSize): Accepted a patch by
* tests/io.test: Alexandre Ferrieux <ferrieux@users.sourceforge.net>
* tests/chanio.test: to fix the [Bug 1969953]. Buffersize outside
of the supported range are now clipped to nearest boundary instead
of ignored.
Diffstat (limited to 'win')
| -rw-r--r-- | win/Makefile.in | 7 | ||||
| -rw-r--r-- | win/tclWinChan.c | 4 |
2 files changed, 6 insertions, 5 deletions
diff --git a/win/Makefile.in b/win/Makefile.in index 6bd5e39..58a3505 100644 --- a/win/Makefile.in +++ b/win/Makefile.in @@ -4,7 +4,7 @@ # "./configure", which is a configuration script generated by the "autoconf" # program (constructs like "@foo@" will get replaced in the actual Makefile. # -# RCS: @(#) $Id: Makefile.in,v 1.126 2008/04/09 21:44:58 dkf Exp $ +# RCS: @(#) $Id: Makefile.in,v 1.127 2008/05/23 21:00:47 andreas_kupries Exp $ VERSION = @TCL_VERSION@ @@ -716,8 +716,8 @@ gdb: binaries depend: -Makefile: $(SRC_DIR)/Makefile.in - ./config.status +#Makefile: $(SRC_DIR)/Makefile.in +# ./config.status cleanhelp: $(RM) *.hlp *.cnt *.GID *.rtf man2tcl.exe @@ -763,3 +763,4 @@ html-tcl: $(TCLSH) $(MAKE) shell SCRIPT="$(TOOL_DIR)/tcltk-man2html.tcl --htmldir=$(HTML_INSTALL_DIR) --srcdir=$(ROOT_DIR)/.. $(BUILD_HTML_FLAGS) --tcl" html-tk: $(TCLSH) $(MAKE) shell SCRIPT="$(TOOL_DIR)/tcltk-man2html.tcl --htmldir=$(HTML_INSTALL_DIR) --srcdir=$(ROOT_DIR)/.. $(BUILD_HTML_FLAGS) --tk" + diff --git a/win/tclWinChan.c b/win/tclWinChan.c index 98a529a..5d2a774 100644 --- a/win/tclWinChan.c +++ b/win/tclWinChan.c @@ -9,7 +9,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclWinChan.c,v 1.50 2008/04/27 22:21:36 dkf Exp $ + * RCS: @(#) $Id: tclWinChan.c,v 1.51 2008/05/23 21:00:47 andreas_kupries Exp $ */ #include "tclWinInt.h" @@ -575,7 +575,7 @@ FileWideSeekProc( return -1; } } - return (Tcl_LongAsWide(newPos) | (Tcl_LongAsWide(newPosHigh) << 32)); + return (((Tcl_WideInt)((unsigned)newPos)) | (Tcl_LongAsWide(newPosHigh) << 32)); } /* |