diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2013-02-03 17:17:47 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2013-02-03 17:17:47 (GMT) |
| commit | 3c3f3d4561fe16f54fc6ded233112c6040ab5e77 (patch) | |
| tree | 85ae40b56e9038a7a38c1898d87851171e1174ea /generic/tclEncoding.c | |
| parent | 1d5118fd6cf705d79ec670284492d9eff6637965 (diff) | |
| parent | b0bf6914f1e11ba4b7a127dcda5cd48f96976a33 (diff) | |
| download | tcl-3c3f3d4561fe16f54fc6ded233112c6040ab5e77.zip tcl-3c3f3d4561fe16f54fc6ded233112c6040ab5e77.tar.gz tcl-3c3f3d4561fe16f54fc6ded233112c6040ab5e77.tar.bz2 | |
merge novem
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 a5b4d74..8247eea 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); } /* |