aboutsummaryrefslogtreecommitdiffstats
path: root/src/font.c
diff options
context:
space:
mode:
authorPaul Eggert2011-02-05 02:20:15 -0800
committerPaul Eggert2011-02-05 02:20:15 -0800
commit25a48bd06bd5979d201cddde99e2dec1eb54c184 (patch)
treeaef22df016ceb89400520afb0a2a323ec9dc43f1 /src/font.c
parentd154c079dd429eb5b641139152e7714bfddca519 (diff)
downloademacs-25a48bd06bd5979d201cddde99e2dec1eb54c184.tar.gz
emacs-25a48bd06bd5979d201cddde99e2dec1eb54c184.zip
xstrcasecmp: conform to C89 pointer rules
Diffstat (limited to 'src/font.c')
-rw-r--r--src/font.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/font.c b/src/font.c
index 907271566da..394c0055328 100644
--- a/src/font.c
+++ b/src/font.c
@@ -315,7 +315,7 @@ font_style_to_value (enum font_property_index prop, Lisp_Object val, int noerror
315 315
316 if (SYMBOLP (val)) 316 if (SYMBOLP (val))
317 { 317 {
318 unsigned char *s; 318 char *s;
319 Lisp_Object args[2], elt; 319 Lisp_Object args[2], elt;
320 320
321 /* At first try exact match. */ 321 /* At first try exact match. */
@@ -325,12 +325,12 @@ font_style_to_value (enum font_property_index prop, Lisp_Object val, int noerror
325 return ((XINT (AREF (AREF (table, i), 0)) << 8) 325 return ((XINT (AREF (AREF (table, i), 0)) << 8)
326 | (i << 4) | (j - 1)); 326 | (i << 4) | (j - 1));
327 /* Try also with case-folding match. */ 327 /* Try also with case-folding match. */
328 s = SDATA (SYMBOL_NAME (val)); 328 s = SSDATA (SYMBOL_NAME (val));
329 for (i = 0; i < len; i++) 329 for (i = 0; i < len; i++)
330 for (j = 1; j < ASIZE (AREF (table, i)); j++) 330 for (j = 1; j < ASIZE (AREF (table, i)); j++)
331 { 331 {
332 elt = AREF (AREF (table, i), j); 332 elt = AREF (AREF (table, i), j);
333 if (xstrcasecmp (s, SDATA (SYMBOL_NAME (elt))) == 0) 333 if (xstrcasecmp (s, SSDATA (SYMBOL_NAME (elt))) == 0)
334 return ((XINT (AREF (AREF (table, i), 0)) << 8) 334 return ((XINT (AREF (AREF (table, i), 0)) << 8)
335 | (i << 4) | (j - 1)); 335 | (i << 4) | (j - 1));
336 } 336 }