diff options
| author | nijtmans <nijtmans> | 2008-11-05 22:20:59 (GMT) |
|---|---|---|
| committer | nijtmans <nijtmans> | 2008-11-05 22:20:59 (GMT) |
| commit | 436906415b673fbac6d7ce14621ad07a9a78b4a2 (patch) | |
| tree | bb9005f0a49cd1cc708acc016a5b556166154d74 /unix/tkUnixFont.c | |
| parent | a7112d75b06f0c7bba86d032d765f74116f4c41e (diff) | |
| download | tk-436906415b673fbac6d7ce14621ad07a9a78b4a2.zip tk-436906415b673fbac6d7ce14621ad07a9a78b4a2.tar.gz tk-436906415b673fbac6d7ce14621ad07a9a78b4a2.tar.bz2 | |
fix [Bug 2226093] const changes not all correct
more internal -Wwrite-string warning fixes
Diffstat (limited to 'unix/tkUnixFont.c')
| -rw-r--r-- | unix/tkUnixFont.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/unix/tkUnixFont.c b/unix/tkUnixFont.c index b5feb2c..405b19c 100644 --- a/unix/tkUnixFont.c +++ b/unix/tkUnixFont.c @@ -9,7 +9,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkUnixFont.c,v 1.37 2008/11/02 09:54:02 nijtmans Exp $ + * RCS: @(#) $Id: tkUnixFont.c,v 1.38 2008/11/05 22:20:59 nijtmans Exp $ */ #include "tkUnixInt.h" @@ -1971,7 +1971,7 @@ FindSubFontForChar( Tk_Uid faceName; const char *fallback; const char *const *aliases; - const char *const *nameList; + char **nameList; const char *const *anyFallbacks; const char *const *const *fontFallbacks; SubFont *subFontPtr; @@ -2406,8 +2406,8 @@ CanUseFallback( Tk_Uid hateFoundry; const char *charset, *hateCharset; unsigned bestScore[2]; - const char *const *nameList; - const char *const *nameListOrig; + char **nameList; + char **nameListOrig; char src[TCL_UTF_MAX]; FontAttributes want, got; Display *display; @@ -2913,7 +2913,8 @@ ListFontOrAlias( int *numNamesPtr) /* Filled with length of returned array, or 0 * if no names were found. */ { - char **nameList, **aliases; + char **nameList; + const char *const *aliases; int i; nameList = ListFonts(display, faceName, numNamesPtr); @@ -2962,7 +2963,8 @@ IdentifySymbolEncodings( FontAttributes *faPtr) { int i, j; - char **aliases, **symbolClass; + const char *const *aliases; + const char *const *symbolClass; symbolClass = TkFontGetSymbolClass(); for (i = 0; symbolClass[i] != NULL; i++) { |