diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2018-10-12 17:54:42 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2018-10-12 17:54:42 (GMT) |
| commit | cc945fabb73c3733169f7441140a7b2f2c57572c (patch) | |
| tree | 3641ec6151d50a51e2507d6e106a5c2f5a0025e1 /generic/tclZlib.c | |
| parent | 621251ae2e2fd50bbee979906ce537aae53f1e33 (diff) | |
| download | tcl-cc945fabb73c3733169f7441140a7b2f2c57572c.zip tcl-cc945fabb73c3733169f7441140a7b2f2c57572c.tar.gz tcl-cc945fabb73c3733169f7441140a7b2f2c57572c.tar.bz2 | |
Fix test for UNICODE in win/tclAppInit.c. No longer check for "tclsh install", because tclsh is not compiled with that. Fix minizip.c compilation on systems without open64()
Diffstat (limited to 'generic/tclZlib.c')
| -rw-r--r-- | generic/tclZlib.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/generic/tclZlib.c b/generic/tclZlib.c index 9bad36d..d4a8ecb 100644 --- a/generic/tclZlib.c +++ b/generic/tclZlib.c @@ -117,7 +117,7 @@ typedef struct { z_stream outStream; /* Structure used by zlib for compression of * output. */ char *inBuffer, *outBuffer; /* Working buffers. */ - int inAllocated, outAllocated; + size_t inAllocated, outAllocated; /* Sizes of working buffers. */ GzipHeader inHeader; /* Header read from input stream, when * decompressing a gzip stream. */ @@ -1515,7 +1515,7 @@ Tcl_ZlibStreamGet( Tcl_ListObjIndex(NULL, zshPtr->outData, 0, &itemObj); itemPtr = Tcl_GetByteArrayFromObj(itemObj, &itemLen); if (itemLen-zshPtr->outPos >= count-dataPos) { - unsigned len = count - dataPos; + size_t len = count - dataPos; memcpy(dataPtr + dataPos, itemPtr + zshPtr->outPos, len); zshPtr->outPos += len; @@ -1524,7 +1524,7 @@ Tcl_ZlibStreamGet( zshPtr->outPos = 0; } } else { - unsigned len = itemLen - zshPtr->outPos; + size_t len = itemLen - zshPtr->outPos; memcpy(dataPtr + dataPos, itemPtr + zshPtr->outPos, len); dataPos += len; |