summaryrefslogtreecommitdiffstats
path: root/win
diff options
context:
space:
mode:
authorandreas_kupries <akupries@shaw.ca>2008-05-23 21:12:10 (GMT)
committerandreas_kupries <akupries@shaw.ca>2008-05-23 21:12:10 (GMT)
commit199e87f5e360b10f877d2830dc15ea969dad655b (patch)
tree09f8a527074947365fa5a6bc24350f0a7416dcb7 /win
parentde1bb7a14fd63e5fb0a20ea489dcba8e439937b7 (diff)
downloadtcl-199e87f5e360b10f877d2830dc15ea969dad655b.zip
tcl-199e87f5e360b10f877d2830dc15ea969dad655b.tar.gz
tcl-199e87f5e360b10f877d2830dc15ea969dad655b.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> 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/tclWinChan.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/win/tclWinChan.c b/win/tclWinChan.c
index 90c13f7..51a1c08 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.30.2.5 2006/08/30 17:53:28 hobbs Exp $
+ * RCS: @(#) $Id: tclWinChan.c,v 1.30.2.6 2008/05/23 21:12:12 andreas_kupries Exp $
*/
#include "tclWinInt.h"
@@ -576,7 +576,7 @@ FileWideSeekProc(instanceData, offset, mode, errorCodePtr)
return -1;
}
}
- return ((Tcl_WideInt) newPos) | (((Tcl_WideInt) newPosHigh) << 32);
+ return (((Tcl_WideInt)((unsigned)newPos)) | (Tcl_LongAsWide(newPosHigh) << 32));
}
/*