summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2011-11-01 14:40:55 (GMT)
committerdgp <dgp@users.sourceforge.net>2011-11-01 14:40:55 (GMT)
commita618cfc343f3e88603f0456caf5843ded82e21d6 (patch)
tree88c44a6de5e6c2de80fa7e2a177e12cba4c97f48
parente54423cee271e735eb4a07630a04ab85ef396d35 (diff)
parent11331dcc6389af44efbfc5fdef4fe63c31dcf2e4 (diff)
downloadtcl-a618cfc343f3e88603f0456caf5843ded82e21d6.zip
tcl-a618cfc343f3e88603f0456caf5843ded82e21d6.tar.gz
tcl-a618cfc343f3e88603f0456caf5843ded82e21d6.tar.bz2
merge to release
-rw-r--r--ChangeLog2
-rw-r--r--generic/tclTest.c4
-rw-r--r--generic/tclThreadAlloc.c4
3 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 06b562b..c221c3d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
2011-10-20 Don Porter <dgp@users.sourceforge.net>
+ *** 8.5.11 TAGGED FOR RELEASE ***
+
* library/http/http.tcl: Bump to version 2.7.7
* library/http/pkgIndex.tcl:
* unix/Makefile.in:
diff --git a/generic/tclTest.c b/generic/tclTest.c
index 2430d1a..0f497b0 100644
--- a/generic/tclTest.c
+++ b/generic/tclTest.c
@@ -868,7 +868,7 @@ TestasyncCmd(
if (asyncPtr->id == id) {
Tcl_ThreadId threadID;
if (Tcl_CreateThread(&threadID, AsyncThreadProc,
- (ClientData) id, TCL_THREAD_STACK_DEFAULT,
+ (ClientData) INT2PTR(id), TCL_THREAD_STACK_DEFAULT,
TCL_THREAD_NOFLAGS) != TCL_OK) {
Tcl_SetResult(interp, "can't create thread", TCL_STATIC);
return TCL_ERROR;
@@ -956,7 +956,7 @@ AsyncThreadProc(
* TestAsyncHandler, defined above. */
{
TestAsyncHandler *asyncPtr;
- int id = (int) clientData;
+ int id = PTR2INT(clientData);
Tcl_Sleep(1);
Tcl_MutexLock(&asyncTestMutex);
diff --git a/generic/tclThreadAlloc.c b/generic/tclThreadAlloc.c
index bea85bd..9008d52 100644
--- a/generic/tclThreadAlloc.c
+++ b/generic/tclThreadAlloc.c
@@ -291,6 +291,7 @@ TclpAlloc(
register int bucket;
size_t size;
+#ifndef __LP64__
if (sizeof(int) >= sizeof(size_t)) {
/* An unsigned int overflow can also be a size_t overflow */
const size_t zero = 0;
@@ -301,6 +302,7 @@ TclpAlloc(
return NULL;
}
}
+#endif
cachePtr = TclpGetAllocCache();
if (cachePtr == NULL) {
@@ -434,6 +436,7 @@ TclpRealloc(
return TclpAlloc(reqSize);
}
+#ifndef __LP64__
if (sizeof(int) >= sizeof(size_t)) {
/* An unsigned int overflow can also be a size_t overflow */
const size_t zero = 0;
@@ -444,6 +447,7 @@ TclpRealloc(
return NULL;
}
}
+#endif
cachePtr = TclpGetAllocCache();
if (cachePtr == NULL) {