diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-07-02 11:18:59 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-07-02 11:18:59 (GMT) |
| commit | 2e99996e18b1b15181b730a451f5e6107bc412fd (patch) | |
| tree | 7d60025f834c6af5ed11e12e12c9565f79d66881 /unix/tkUnixFont.c | |
| parent | 767047298510f716f70c177534980f53fbbd2406 (diff) | |
| parent | 8d9bcf37ddbe36e3fd50042d8dfb15bc5a6c2d12 (diff) | |
| download | tk-2e99996e18b1b15181b730a451f5e6107bc412fd.zip tk-2e99996e18b1b15181b730a451f5e6107bc412fd.tar.gz tk-2e99996e18b1b15181b730a451f5e6107bc412fd.tar.bz2 | |
Merge 8.6
Diffstat (limited to 'unix/tkUnixFont.c')
| -rw-r--r-- | unix/tkUnixFont.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/unix/tkUnixFont.c b/unix/tkUnixFont.c index 7a74986..8605934 100644 --- a/unix/tkUnixFont.c +++ b/unix/tkUnixFont.c @@ -153,7 +153,7 @@ typedef struct FontAttributes { TkXLFDAttributes xa; } FontAttributes; -typedef struct ThreadSpecificData { +typedef struct { FontFamily *fontFamilyList; /* The list of font families that are * currently loaded. As screen fonts are * loaded, this list grows to hold information @@ -316,14 +316,8 @@ TkpFontPkgInit( Tcl_Encoding ucs2; if (tsdPtr->controlFamily.encoding == NULL) { - Tcl_EncodingType type; - type.encodingName = "X11ControlChars"; - type.toUtfProc = ControlUtfProc; - type.fromUtfProc = ControlUtfProc; - type.freeProc = NULL; - type.clientData = NULL; - type.nullSize = 0; + Tcl_EncodingType type = {"X11ControlChars", ControlUtfProc, ControlUtfProc, NULL, NULL, 0}; tsdPtr->controlFamily.refCount = 2; tsdPtr->controlFamily.encoding = Tcl_CreateEncoding(&type); tsdPtr->controlFamily.isTwoByteFont = 0; @@ -342,8 +336,8 @@ TkpFontPkgInit( ucs2 = Tcl_GetEncoding(NULL, "ucs-2be"); if (ucs2 == NULL) { - Tcl_EncodingType type = {"ucs-2be", Ucs2beToUtfProc, UtfToUcs2beProc, NULL, NULL, 2}; - Tcl_CreateEncoding(&type); + Tcl_EncodingType ucs2type = {"ucs-2be", Ucs2beToUtfProc, UtfToUcs2beProc, NULL, NULL, 2}; + Tcl_CreateEncoding(&ucs2type); } else { Tcl_FreeEncoding(ucs2); } |