summaryrefslogtreecommitdiffstats
path: root/unix
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2020-02-14 10:22:36 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2020-02-14 10:22:36 (GMT)
commit7742d4cb9cb8d0ec8b8d74cfc08ec03f05f81f38 (patch)
treebe46261487eefa17061a9c301d534e36dc38d294 /unix
parentfce0e9f9fe32cba0072d7a4dd1a34cd8728409b4 (diff)
parentaa229cea31b0aed0f56b713709747a206c017b37 (diff)
downloadtk-7742d4cb9cb8d0ec8b8d74cfc08ec03f05f81f38.zip
tk-7742d4cb9cb8d0ec8b8d74cfc08ec03f05f81f38.tar.gz
tk-7742d4cb9cb8d0ec8b8d74cfc08ec03f05f81f38.tar.bz2
Merge trunk
Diffstat (limited to 'unix')
-rw-r--r--unix/tkUnixFont.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/unix/tkUnixFont.c b/unix/tkUnixFont.c
index c1e9264..800d1e5 100644
--- a/unix/tkUnixFont.c
+++ b/unix/tkUnixFont.c
@@ -848,7 +848,7 @@ TkpGetFontFamilies(
Tk_Window tkwin) /* For display to query. */
{
int i, isNew, numNames;
- char *family, **nameList;
+ const char *family, **nameList;
Tcl_HashTable familyTable;
Tcl_HashEntry *hPtr;
Tcl_HashSearch search;
@@ -857,7 +857,7 @@ TkpGetFontFamilies(
Tcl_InitHashTable(&familyTable, TCL_STRING_KEYS);
nameList = ListFonts(Tk_Display(tkwin), "*", &numNames);
for (i = 0; i < numNames; i++) {
- char *familyEnd;
+ const char *familyEnd;
family = strchr(nameList[i] + 1, '-');
if (family == NULL) {