diff options
author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-07-07 22:00:15 (GMT) |
---|---|---|
committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-07-07 22:00:15 (GMT) |
commit | 8acb512c92c1b619073eac7d604ab9791ef0e713 (patch) | |
tree | 3e9691c13e240731e5cf78e7e27ff536d68a4bab /generic/tkObj.c | |
parent | 90b1090817bbf37d8787cc9ed77f2a4ca7460bb7 (diff) | |
parent | 2d8d71bb9e77b74a29295db7280e8383c4ac4df0 (diff) | |
download | tk-8acb512c92c1b619073eac7d604ab9791ef0e713.zip tk-8acb512c92c1b619073eac7d604ab9791ef0e713.tar.gz tk-8acb512c92c1b619073eac7d604ab9791ef0e713.tar.bz2 |
Merge trunk
Diffstat (limited to 'generic/tkObj.c')
-rw-r--r-- | generic/tkObj.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/generic/tkObj.c b/generic/tkObj.c index b857d98..1a98db6 100644 --- a/generic/tkObj.c +++ b/generic/tkObj.c @@ -47,7 +47,7 @@ typedef struct PixelRep { * thread. */ -typedef struct ThreadSpecificData { +typedef struct { const Tcl_ObjType *doubleTypePtr; const Tcl_ObjType *intTypePtr; } ThreadSpecificData; @@ -100,7 +100,7 @@ static int SetWindowFromAny(Tcl_Interp *interp, Tcl_Obj *objPtr); /* * The following structure defines the implementation of the "pixel" Tcl * object, used for measuring distances. The pixel object remembers its - * initial display-independant settings. + * initial display-independent settings. */ static const Tcl_ObjType pixelObjType = { @@ -114,7 +114,7 @@ static const Tcl_ObjType pixelObjType = { /* * The following structure defines the implementation of the "pixel" Tcl * object, used for measuring distances. The pixel object remembers its - * initial display-independant settings. + * initial display-independent settings. */ static const Tcl_ObjType mmObjType = { @@ -672,7 +672,7 @@ UpdateStringOfMM( { MMRep *mmPtr; char buffer[TCL_DOUBLE_SPACE]; - size_t len; + TkSizeT len; mmPtr = objPtr->internalRep.twoPtrValue.ptr1; /* assert( mmPtr->units == -1 && objPtr->bytes == NULL ); */ |