* xfont.c (compare_font_names): Redo to omit the need for casts.

diff --git a/src/ChangeLog b/src/ChangeLog
index cfabe84642203af65e934d6877ecfb28d15f7fd1..96458770122830a0c2e23fe1e10ecde0861c65c2 100644 (file)
--- 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 cc06e27fe024bdfc2015ce52eec09d3470f0f659..b7a1e06199edfc4e881ed2f95a948582df6ec3d9 100644 (file)
--- 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