diff options
| author | dgp <dgp@users.sourceforge.net> | 2011-11-01 14:40:55 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2011-11-01 14:40:55 (GMT) |
| commit | 879982f8badbcbad0712c4962bb0dcc92f0d45b6 (patch) | |
| tree | 88c44a6de5e6c2de80fa7e2a177e12cba4c97f48 | |
| parent | 38a1f6c276f00c641bb85a2c5281a917c20fe0b4 (diff) | |
| parent | d70fdf0f646214181606e609768b1ee62ad1b5cc (diff) | |
| download | tcl-879982f8badbcbad0712c4962bb0dcc92f0d45b6.zip tcl-879982f8badbcbad0712c4962bb0dcc92f0d45b6.tar.gz tcl-879982f8badbcbad0712c4962bb0dcc92f0d45b6.tar.bz2 | |
merge to release
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | generic/tclTest.c | 4 | ||||
| -rw-r--r-- | generic/tclThreadAlloc.c | 4 |
3 files changed, 8 insertions, 2 deletions
@@ -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) { |