diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2012-07-06 13:49:23 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2012-07-06 13:49:23 -0700 |
| commit | fd573f31dcaec9cd5170ba33af10d7c71c56822c (patch) | |
| tree | 6e8a4028866bd61e028e3deb265267fd2bb84d5e /src | |
| parent | fca8d6b6871079195376ff9db564f659215d7295 (diff) | |
| download | emacs-fd573f31dcaec9cd5170ba33af10d7c71c56822c.tar.gz | |
* xfont.c (compare_font_names): Redo to omit the need for casts.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/xfont.c | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index cfabe846422..96458770122 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2012-07-06 Paul Eggert <eggert@cs.ucla.edu> + + * xfont.c (compare_font_names): Redo to omit the need for casts. + 2012-07-06 Andreas Schwab <schwab@linux-m68k.org> * xfns.c (Fx_change_window_property): Doc fix. diff --git a/src/xfont.c b/src/xfont.c index cc06e27fe02..b7a1e06199e 100644 --- a/src/xfont.c +++ b/src/xfont.c @@ -164,8 +164,9 @@ xfont_get_cache (FRAME_PTR f) static int compare_font_names (const void *name1, const void *name2) { - return xstrcasecmp (*(const char **) name1, - *(const char **) name2); + char *const *n1 = name1; + char *const *n2 = name2; + return xstrcasecmp (*n1, *n2); } /* Decode XLFD as iso-8859-1 into OUTPUT, and return the byte length |