diff options
| author | seandeelywoods <seandeelywoods> | 2013-03-18 12:38:37 (GMT) |
|---|---|---|
| committer | seandeelywoods <seandeelywoods> | 2013-03-18 12:38:37 (GMT) |
| commit | 4e4e1c664b353f64c7a9ca59746bec7b5befd8d5 (patch) | |
| tree | 4d3c38f64ccfdaa10bae3a01f5ccaea8a88e56af /generic/tclEncoding.c | |
| parent | 24814481a81d3316432846ff13a30456736df625 (diff) | |
| parent | 3fda4f0df6f0fdabe84372aee281ffb4ca7108e1 (diff) | |
| download | tcl-4e4e1c664b353f64c7a9ca59746bec7b5befd8d5.zip tcl-4e4e1c664b353f64c7a9ca59746bec7b5befd8d5.tar.gz tcl-4e4e1c664b353f64c7a9ca59746bec7b5befd8d5.tar.bz2 | |
Merging with updates from trunk
Diffstat (limited to 'generic/tclEncoding.c')
| -rw-r--r-- | generic/tclEncoding.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/generic/tclEncoding.c b/generic/tclEncoding.c index 7d2206b..2cc55d6 100644 --- a/generic/tclEncoding.c +++ b/generic/tclEncoding.c @@ -9,7 +9,6 @@ * this file, and for a DISCLAIMER OF ALL WARRANTIES. */ -#include <sys/stat.h> #include "tclInt.h" typedef size_t (LengthProc)(const char *src); @@ -271,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]. */ @@ -314,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); @@ -335,7 +334,7 @@ static void FreeEncodingIntRep( Tcl_Obj *objPtr) { - Tcl_FreeEncoding(objPtr->internalRep.otherValuePtr); + Tcl_FreeEncoding(objPtr->internalRep.twoPtrValue.ptr1); objPtr->typePtr = NULL; } @@ -354,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); } /* |