[Emacs-diffs] /srv/bzr/emacs/trunk r108921: * xfont.c (compare_font_names): Redo to omit the need for casts.

[Paul Eggert]

------------------------------------------------------------
revno: 108921
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Fri 2012-07-06 13:49:23 -0700
message:
  * xfont.c (compare_font_names): Redo to omit the need for casts.
modified:
  src/ChangeLog
  src/xfont.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-07-06 20:00:42 +0000
+++ b/src/ChangeLog     2012-07-06 20:49:23 +0000
@@ -1,3 +1,7 @@
+2012-07-06  Paul Eggert  <address@hidden>
+
+       * xfont.c (compare_font_names): Redo to omit the need for casts.
+
 2012-07-06  Andreas Schwab  <address@hidden>
 
        * xfns.c (Fx_change_window_property): Doc fix.

=== modified file 'src/xfont.c'
--- a/src/xfont.c       2012-06-13 00:26:40 +0000
+++ b/src/xfont.c       2012-07-06 20:49:23 +0000
@@ -164,8 +164,9 @@
 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