Commit 6702c559 authored by Eli Zaretskii's avatar Eli Zaretskii

Fix the MS-Windows build broken 2013-10-25T04:35:56Z!dgutov@yandex.ru.

 src/w32font.h (w32font_close): Adjust the prototype to the change in
 function definition.
 src/w32font.c (w32font_close): Reintroduce deleted declaration of i.
 src/w32uniscribe.c (uniscribe_close): Adapt the call to
 w32font_close to its new prototype.
parent 86bd985e
2013-10-25 Eli Zaretskii <eliz@gnu.org>
* w32font.h (w32font_close): Adjust the prototype to the change in
function definition.
* w32font.c (w32font_close): Reintroduce deleted declaration of i.
* w32uniscribe.c (uniscribe_close): Adapt the call to
w32font_close to its new prototype.
2013-10-25 Dmitry Antipov <dmantipov@yandex.ru>
Omit unused frame argument of font API's close function.
......
......@@ -391,6 +391,8 @@ w32font_close (struct font *font)
/* Free all the cached metrics. */
if (w32_font->cached_metrics)
{
int i;
for (i = 0; i < w32_font->n_cache_blocks; i++)
xfree (w32_font->cached_metrics[i]);
xfree (w32_font->cached_metrics);
......
......@@ -72,7 +72,7 @@ Lisp_Object w32font_match_internal (struct frame *f,
int opentype_only);
int w32font_open_internal (struct frame *f, Lisp_Object font_entity,
int pixel_size, Lisp_Object font_object);
void w32font_close (struct frame *f, struct font *font);
void w32font_close (struct font *font);
int w32font_has_char (Lisp_Object entity, int c);
int w32font_text_extents (struct font *font, unsigned *code, int nglyphs,
struct font_metrics *metrics);
......
......@@ -143,7 +143,7 @@ uniscribe_close (struct frame *f, struct font *font)
if (uniscribe_font->cache)
ScriptFreeCache (&(uniscribe_font->cache));
w32font_close (f, font);
w32font_close (font);
}
/* Return a list describing which scripts/languages FONT supports by
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment