diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-02-14 10:22:36 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-02-14 10:22:36 (GMT) |
| commit | 7742d4cb9cb8d0ec8b8d74cfc08ec03f05f81f38 (patch) | |
| tree | be46261487eefa17061a9c301d534e36dc38d294 /generic | |
| parent | fce0e9f9fe32cba0072d7a4dd1a34cd8728409b4 (diff) | |
| parent | aa229cea31b0aed0f56b713709747a206c017b37 (diff) | |
| download | tk-7742d4cb9cb8d0ec8b8d74cfc08ec03f05f81f38.zip tk-7742d4cb9cb8d0ec8b8d74cfc08ec03f05f81f38.tar.gz tk-7742d4cb9cb8d0ec8b8d74cfc08ec03f05f81f38.tar.bz2 | |
Merge trunk
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tkFont.c | 2 | ||||
| -rw-r--r-- | generic/tkOption.c | 2 | ||||
| -rw-r--r-- | generic/tkStyle.c | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/generic/tkFont.c b/generic/tkFont.c index 9112784..1604eca 100644 --- a/generic/tkFont.c +++ b/generic/tkFont.c @@ -3580,7 +3580,7 @@ ParseFontNameObj( * specified in font name are filled with * default values. */ { - char *dash; + const char *dash; int objc, result, i, n; Tcl_Obj **objv; const char *string; diff --git a/generic/tkOption.c b/generic/tkOption.c index 64832ad..54ddb34 100644 --- a/generic/tkOption.c +++ b/generic/tkOption.c @@ -406,7 +406,7 @@ Tk_GetOption( * name. */ { Tk_Uid nameId, classId = NULL; - char *masqName; + const char *masqName; Element *elPtr, *bestPtr; int count; StackLevel *levelPtr; diff --git a/generic/tkStyle.c b/generic/tkStyle.c index 469312b..9ec08ca 100644 --- a/generic/tkStyle.c +++ b/generic/tkStyle.c @@ -613,7 +613,7 @@ CreateElement( Tcl_HashEntry *entryPtr, *engineEntryPtr; Tcl_HashSearch search; int newEntry, elementId, genericId = -1; - char *dot; + const char *dot; StyleEngine *enginePtr; /* @@ -694,7 +694,7 @@ Tk_GetElementId( Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData)); Tcl_HashEntry *entryPtr; int genericId = -1; - char *dot; + const char *dot; /* * Find the element Id. |