From: Paul Eggert <eggert@cs.ucla.edu>
Date: Fri, 6 Jul 2012 20:49:23 +0000 (-0700)
Subject: * xfont.c (compare_font_names): Redo to omit the need for casts.
X-Git-Tag: emacs-24.2.90~1199^2~166
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=fd573f31dcaec9cd5170ba33af10d7c71c56822c;p=emacs.git

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

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