Fix xassert-related bootstrap errors.

* src/xfaces.c (x_free_gc): Protect xassert with GLYPH_DEBUG.
* src/xfns.c (unwind_create_frame): Ditto.
* src/dispnew.c (build_frame_matrix_from_leaf_window): Ditto.

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-283

3 files changed, 6 insertions, 0 deletions

diff --git a/src/dispnew.c b/src/dispnew.c
index 3fef2af7429..47e36aa991c 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -2766,9 +2766,11 @@ build_frame_matrix_from_leaf_window (frame_matrix, w)
               SET_CHAR_GLYPH_FROM_GLYPH (*border, right_border_glyph);
             }
 
+#if GLYPH_DEBUG
           /* Window row window_y must be a slice of frame row
              frame_y.  */
           xassert (glyph_row_slice_p (window_row, frame_row));
+#endif
 
           /* If rows are in sync, we don't have to copy glyphs because
              frame and window share glyphs.  */
diff --git a/src/xfaces.c b/src/xfaces.c
index e592357c067..0c4665a4cb6 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -741,7 +741,9 @@ x_free_gc (f, gc)
      GC gc;
 {
   BLOCK_INPUT;
+#if GLYPH_DEBUG
   xassert (--ngcs >= 0);
+#endif
   XFreeGC (FRAME_X_DISPLAY (f), gc);
   UNBLOCK_INPUT;
 }
diff --git a/src/xfns.c b/src/xfns.c
index cafa36ae11c..eaae071ef26 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -2873,9 +2873,11 @@ unwind_create_frame (frame)
 
       x_free_frame_resources (f);
 
+#if GLYPH_DEBUG
       /* Check that reference counts are indeed correct.  */
       xassert (dpyinfo->reference_count == dpyinfo_refcount);
       xassert (dpyinfo->image_cache->refcount == image_cache_refcount);
+#endif
       return Qt;
     }