diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2013-01-31 10:31:55 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2013-01-31 10:31:55 (GMT) |
| commit | 2f3e5e010b0f103d9c1afbe009a9ca9aa648766e (patch) | |
| tree | 93d16010bea954703aad736080cb17ea3af82b51 /generic/tclEncoding.c | |
| parent | f50bf4d17a2021e535f47e5253e24bd3dc1269b5 (diff) | |
| parent | 31f3f5ff6333217316c5da442a0194085211dfe1 (diff) | |
| download | tcl-2f3e5e010b0f103d9c1afbe009a9ca9aa648766e.zip tcl-2f3e5e010b0f103d9c1afbe009a9ca9aa648766e.tar.gz tcl-2f3e5e010b0f103d9c1afbe009a9ca9aa648766e.tar.bz2 | |
merge core-8-5-branch
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 7d2206b..86da28c 100644 --- a/generic/tclEncoding.c +++ b/generic/tclEncoding.c @@ -271,7 +271,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]. */ @@ -314,7 +314,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); @@ -335,7 +335,7 @@ static void FreeEncodingIntRep( Tcl_Obj *objPtr) { - Tcl_FreeEncoding(objPtr->internalRep.otherValuePtr); + Tcl_FreeEncoding(objPtr->internalRep.twoPtrValue.ptr1); objPtr->typePtr = NULL; } @@ -354,7 +354,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); } /* |