[Emacs-diffs] trunk r114798: Fix the MS-Windows build broken revision 114795.

[Eli Zaretskii]

------------------------------------------------------------
revno: 114798
revision-id: address@hidden
parent: address@hidden
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Fri 2013-10-25 12:42:41 +0300
message:
  Fix the MS-Windows build broken revision 114795.
  
   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.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/w32font.c                  w32font.c-20091113204419-o5vbwnq5f7feedwu-8545
  src/w32font.h                  w32font.h-20091113204419-o5vbwnq5f7feedwu-8546
  src/w32uniscribe.c             
w32uniscribe.c-20091113204419-o5vbwnq5f7feedwu-8619

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-10-25 07:28:16 +0000
+++ b/src/ChangeLog     2013-10-25 09:42:41 +0000
@@ -1,3 +1,13 @@
+2013-10-25  Eli Zaretskii  <address@hidden>
+
+       * 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  <address@hidden>
 
        Omit unused frame argument of font API's close function.

=== modified file 'src/w32font.c'
--- a/src/w32font.c     2013-10-25 06:55:36 +0000
+++ b/src/w32font.c     2013-10-25 09:42:41 +0000
@@ -391,6 +391,8 @@
       /* 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);

=== modified file 'src/w32font.h'
--- a/src/w32font.h     2013-08-03 03:29:03 +0000
+++ b/src/w32font.h     2013-10-25 09:42:41 +0000
@@ -72,7 +72,7 @@
                                     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);

=== modified file 'src/w32uniscribe.c'
--- a/src/w32uniscribe.c        2013-08-03 03:29:03 +0000
+++ b/src/w32uniscribe.c        2013-10-25 09:42:41 +0000
@@ -143,7 +143,7 @@
   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