[Emacs-diffs] /srv/bzr/emacs/emacs-24 r108288: Fix compilation with -DGLYPH_DEBUG=1 on MS-Windows.

[Eli Zaretskii]

------------------------------------------------------------
revno: 108288
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Fri 2012-05-18 11:36:50 +0300
message:
  Fix compilation with -DGLYPH_DEBUG=1 on MS-Windows.
  
   src/w32term.c [GLYPH_DEBUG]: Add prototype for x_check_font.
   (x_check_font) [GLYPH_DEBUG]: New function, copied from xterm.c
   src/w32fns.c (unwind_create_frame) [GLYPH_DEBUG]: Fix broken
   reference to image_cache->refcount.
   (x_create_tip_frame): Fix broken use of FRAME_IMAGE_CACHE.
modified:
  src/ChangeLog
  src/w32fns.c
  src/w32term.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-05-17 00:03:49 +0000
+++ b/src/ChangeLog     2012-05-18 08:36:50 +0000
@@ -1,3 +1,14 @@
+2012-05-18  Eli Zaretskii  <address@hidden>
+
+       Fix compilation with -DGLYPH_DEBUG=1 on MS-Windows.
+
+       * w32term.c [GLYPH_DEBUG]: Add prototype for x_check_font.
+       (x_check_font) [GLYPH_DEBUG]: New function, copied from xterm.c
+
+       * w32fns.c (unwind_create_frame) [GLYPH_DEBUG]: Fix broken
+       reference to image_cache->refcount.
+       (x_create_tip_frame): Fix broken use of FRAME_IMAGE_CACHE.
+
 2012-05-17  Juri Linkov  <address@hidden>
 
        * search.c (Fword_search_regexp, Fword_search_backward)

=== modified file 'src/w32fns.c'
--- a/src/w32fns.c      2012-05-11 06:39:26 +0000
+++ b/src/w32fns.c      2012-05-18 08:36:50 +0000
@@ -4003,7 +4003,7 @@
 #if GLYPH_DEBUG
       /* Check that reference counts are indeed correct.  */
       xassert (dpyinfo->reference_count == dpyinfo_refcount);
-      xassert (dpyinfo->image_cache->refcount == image_cache_refcount);
+      xassert (dpyinfo->terminal->image_cache->refcount == 
image_cache_refcount);
 #endif
       return Qt;
     }
@@ -5236,7 +5236,7 @@
 
 #if GLYPH_DEBUG
   image_cache_refcount =
-    FRAME_IMAGE_CACHE ? FRAME_IMAGE_CACHE (f)->refcount : 0;
+    FRAME_IMAGE_CACHE (f) ? FRAME_IMAGE_CACHE (f)->refcount : 0;
   dpyinfo_refcount = dpyinfo->reference_count;
 #endif /* GLYPH_DEBUG */
   FRAME_KBOARD (f) = kb;

=== modified file 'src/w32term.c'
--- a/src/w32term.c     2012-04-09 13:05:48 +0000
+++ b/src/w32term.c     2012-05-18 08:36:50 +0000
@@ -231,6 +231,10 @@
 static void my_set_foreground_window (HWND);
 static void my_destroy_window (struct frame *, HWND);
 
+#if GLYPH_DEBUG
+static void x_check_font (struct frame *, struct font *);
+#endif
+
 static Lisp_Object Qvendor_specific_keysyms;
 
 
@@ -5906,6 +5910,27 @@
 
 
 /***********************************************************************
+                               Fonts
+ ***********************************************************************/
+
+#if GLYPH_DEBUG
+
+/* Check that FONT is valid on frame F.  It is if it can be found in F's
+   font table.  */
+
+static void
+x_check_font (struct frame *f, struct font *font)
+{
+  xassert (font != NULL && ! NILP (font->props[FONT_TYPE_INDEX]));
+  if (font->driver->check)
+    xassert (font->driver->check (f, font) == 0);
+}
+
+#endif /* GLYPH_DEBUG != 0 */
+
+
+
+/***********************************************************************
                            Initialization
  ***********************************************************************/