[Emacs-diffs] trunk r114472: Fix compilation under GLYPH_DEBUG, broken by conditional tool_bar_window.

[Eli Zaretskii]

------------------------------------------------------------
revno: 114472
revision-id: address@hidden
parent: address@hidden
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Sat 2013-09-28 11:19:33 +0300
message:
  Fix compilation under GLYPH_DEBUG, broken by conditional tool_bar_window.
  
   src/xdisp.c (Fdump_tool_bar_row): Ifdef away the body if 'struct
   frame' does not have the tool_bar_window member.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/xdisp.c                    xdisp.c-20091113204419-o5vbwnq5f7feedwu-240

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-09-26 03:46:47 +0000
+++ b/src/ChangeLog     2013-09-28 08:19:33 +0000
@@ -1,3 +1,8 @@
+2013-09-28  Eli Zaretskii  <address@hidden>
+
+       * xdisp.c (Fdump_tool_bar_row): Ifdef away the body if 'struct
+       frame' does not have the tool_bar_window member.
+
 2013-09-26  Barry O'Reilly  <address@hidden>
 
        Signal error when reading an empty byte-code object (Bug#15405)

=== modified file 'src/xdisp.c'
--- a/src/xdisp.c       2013-09-24 06:43:20 +0000
+++ b/src/xdisp.c       2013-09-28 08:19:33 +0000
@@ -18109,9 +18109,13 @@
        doc: /* Dump glyph row ROW of the tool-bar of the current frame to 
stderr.
 GLYPH 0 means don't dump glyphs.
 GLYPH 1 means dump glyphs in short form.
-GLYPH > 1 or omitted means dump glyphs in long form.  */)
+GLYPH > 1 or omitted means dump glyphs in long form.
+
+If there's no tool-bar, or if the tool-bar is not drawn by Emacs,
+do nothing.  */)
   (Lisp_Object row, Lisp_Object glyphs)
 {
+#if defined (HAVE_WINDOW_SYSTEM) && ! defined (USE_GTK) && ! defined (HAVE_NS)
   struct frame *sf = SELECTED_FRAME ();
   struct glyph_matrix *m = XWINDOW (sf->tool_bar_window)->current_matrix;
   EMACS_INT vpos;
@@ -18121,6 +18125,7 @@
   if (vpos >= 0 && vpos < m->nrows)
     dump_glyph_row (MATRIX_ROW (m, vpos), vpos,
                    TYPE_RANGED_INTEGERP (int, glyphs) ? XINT (glyphs) : 2);
+#endif
   return Qnil;
 }