diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2013-02-03 16:05:31 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2013-02-03 16:05:31 (GMT) |
| commit | 6b77853e6dcdec7566901f635b7298c8fa5dd349 (patch) | |
| tree | 01db44fdacc53c737b3eca7e953393794e326a41 /generic/tclEncoding.c | |
| parent | 50a21353617798019e1200fb102877f4c1e1ca22 (diff) | |
| parent | d92d307894b14bbb065fdb65c5158f391da00cf1 (diff) | |
| download | tcl-6b77853e6dcdec7566901f635b7298c8fa5dd349.zip tcl-6b77853e6dcdec7566901f635b7298c8fa5dd349.tar.gz tcl-6b77853e6dcdec7566901f635b7298c8fa5dd349.tar.bz2 | |
merge trunk
Diffstat (limited to 'generic/tclEncoding.c')
| -rw-r--r-- | generic/tclEncoding.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/generic/tclEncoding.c b/generic/tclEncoding.c index 757f771..27a443f 100644 --- a/generic/tclEncoding.c +++ b/generic/tclEncoding.c @@ -270,7 +270,7 @@ static int Iso88591ToUtfProc(ClientData clientData, int *dstCharsPtr); /* - * A Tcl_ObjType for holding a cached Tcl_Encoding in the otherValuePtr field + * A Tcl_ObjType for holding a cached Tcl_Encoding in the twoPtrValue.ptr1 field * of the intrep. This should help the lifetime of encodings be more useful. * See concerns raised in [Bug 1077262]. */ @@ -313,7 +313,7 @@ Tcl_GetEncodingFromObj( return TCL_ERROR; } TclFreeIntRep(objPtr); - objPtr->internalRep.otherValuePtr = encoding; + objPtr->internalRep.twoPtrValue.ptr1 = encoding; objPtr->typePtr = &encodingType; } *encodingPtr = Tcl_GetEncoding(NULL, name); @@ -334,7 +334,7 @@ static void FreeEncodingIntRep( Tcl_Obj *objPtr) { - Tcl_FreeEncoding(objPtr->internalRep.otherValuePtr); + Tcl_FreeEncoding(objPtr->internalRep.twoPtrValue.ptr1); objPtr->typePtr = NULL; } @@ -353,7 +353,7 @@ DupEncodingIntRep( Tcl_Obj *srcPtr, Tcl_Obj *dupPtr) { - dupPtr->internalRep.otherValuePtr = Tcl_GetEncoding(NULL, srcPtr->bytes); + dupPtr->internalRep.twoPtrValue.ptr1 = Tcl_GetEncoding(NULL, srcPtr->bytes); } /* |