Mercurial > emacs
changeset 83243:a464201fbd10
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
| author | Karoly Lorentey <lorentey@elte.hu> |
|---|---|
| date | Thu, 03 Feb 2005 23:44:58 +0000 |
| parents | 2ca9731170cd |
| children | bc15f13b0544 |
| files | src/dispnew.c src/xfaces.c src/xfns.c |
| diffstat | 3 files changed, 6 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/dispnew.c Thu Feb 03 23:31:44 2005 +0000 +++ b/src/dispnew.c Thu Feb 03 23:44:58 2005 +0000 @@ -2766,9 +2766,11 @@ 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. */
--- a/src/xfaces.c Thu Feb 03 23:31:44 2005 +0000 +++ b/src/xfaces.c Thu Feb 03 23:44:58 2005 +0000 @@ -741,7 +741,9 @@ GC gc; { BLOCK_INPUT; +#if GLYPH_DEBUG xassert (--ngcs >= 0); +#endif XFreeGC (FRAME_X_DISPLAY (f), gc); UNBLOCK_INPUT; }
--- a/src/xfns.c Thu Feb 03 23:31:44 2005 +0000 +++ b/src/xfns.c Thu Feb 03 23:44:58 2005 +0000 @@ -2873,9 +2873,11 @@ 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; }