diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2017-12-19 12:26:54 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2017-12-19 12:26:54 (GMT) |
| commit | 051a7ec3ae2008a4d6e1063825a2aa8a6f9a54fe (patch) | |
| tree | db3a1e7dad6e733223117e94dc0707394dc533a2 /generic/tclUtil.c | |
| parent | 99e890b52cbd5beb8ce2065d525e88ef8de9ed7f (diff) | |
| parent | ee66488c3683d1e2b6ac36f523638c42c5649433 (diff) | |
| download | tcl-051a7ec3ae2008a4d6e1063825a2aa8a6f9a54fe.zip tcl-051a7ec3ae2008a4d6e1063825a2aa8a6f9a54fe.tar.gz tcl-051a7ec3ae2008a4d6e1063825a2aa8a6f9a54fe.tar.bz2 | |
merge core-8-branch
Diffstat (limited to 'generic/tclUtil.c')
| -rw-r--r-- | generic/tclUtil.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/generic/tclUtil.c b/generic/tclUtil.c index 6cfad12..b938ce0 100644 --- a/generic/tclUtil.c +++ b/generic/tclUtil.c @@ -3298,6 +3298,7 @@ Tcl_PrintDouble( *---------------------------------------------------------------------- */ +#if !defined(TCL_NO_DEPRECATED) && TCL_MAJOR_VERSION < 9 /* ARGSUSED */ char * TclPrecTraceProc( @@ -3355,6 +3356,7 @@ TclPrecTraceProc( *precisionPtr = prec; return NULL; } +#endif /* !TCL_NO_DEPRECATED)*/ /* *---------------------------------------------------------------------- @@ -4015,7 +4017,7 @@ TclSetProcessGlobalValue( Tcl_IncrRefCount(newValue); cacheMap = GetThreadHash(&pgvPtr->key); ClearHash(cacheMap); - hPtr = Tcl_CreateHashEntry(cacheMap, (void *)(pgvPtr->epoch), &dummy); + hPtr = Tcl_CreateHashEntry(cacheMap, (void *)(size_t)(pgvPtr->epoch), &dummy); Tcl_SetHashValue(hPtr, newValue); Tcl_MutexUnlock(&pgvPtr->mutex); } @@ -4041,7 +4043,7 @@ TclGetProcessGlobalValue( Tcl_Obj *value = NULL; Tcl_HashTable *cacheMap; Tcl_HashEntry *hPtr; - size_t epoch = pgvPtr->epoch; + unsigned int epoch = pgvPtr->epoch; if (pgvPtr->encoding) { Tcl_Encoding current = Tcl_GetEncoding(NULL, NULL); @@ -4075,7 +4077,7 @@ TclGetProcessGlobalValue( } } cacheMap = GetThreadHash(&pgvPtr->key); - hPtr = Tcl_FindHashEntry(cacheMap, (void *) (epoch)); + hPtr = Tcl_FindHashEntry(cacheMap, (void *)(size_t)epoch); if (NULL == hPtr) { int dummy; @@ -4108,7 +4110,7 @@ TclGetProcessGlobalValue( value = Tcl_NewStringObj(pgvPtr->value, pgvPtr->numBytes); hPtr = Tcl_CreateHashEntry(cacheMap, - (void *)(pgvPtr->epoch), &dummy); + (void *)(size_t)(pgvPtr->epoch), &dummy); Tcl_MutexUnlock(&pgvPtr->mutex); Tcl_SetHashValue(hPtr, value); Tcl_IncrRefCount(value); |