From 85fece3ec2ac88faec0ae3da5417d6e60b10cc63 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Wed, 22 Jun 2011 11:15:23 -0700 Subject: GLYPH_DEBUG fixes The following patches are for when GLYPH_DEBUG && !XASSERT. * dispextern.h (trace_redisplay_p, dump_glyph_string): * dispnew.c (flush_stdout): * xdisp.c (dump_glyph_row, dump_glyph_matrix, dump_glyph): Mark as externally visible. * dispnew.c (check_window_matrix_pointers): Now static. * dispnew.c (window_to_frame_vpos): * xfns.c (unwind_create_frame): * xterm.c (x_check_font): Remove unused local. * scroll.c (CHECK_BOUNDS): * xfaces.c (cache_fache): Rename local to avoid shadowing. * xfns.c, w32fns.c (image_cache_refcount, dpyinfo_refcount): Now static. * xdisp.c (check_window_end): Now a no-op if !XASSERTS. (debug_first_unchanged_at_end_vpos, debug_last_unchanged_at_beg_vpos) (debug_dvpos, debug_dy, debug_delta, debug_delta_bytes, debug_end_vpos): Now static. (debug_method_add): Use va_list and vsprintf rather than relying on undefined behavior with wrong number of arguments. (dump_glyph, dump_glyph_row, Fdump_glyph_matrix): Don't assume ptrdiff_t and EMACS_INT are the same width as int. In this code, it's OK to assume C99 behavior for ptrdiff_t formats since we're not interested in debugging glyphs with old libraries. * xfaces.c (cache_face): Move debugging code earlier; this pacifies GCC 4.6.0's static checking. --- src/scroll.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/scroll.c') diff --git a/src/scroll.c b/src/scroll.c index ba012874460..6291936a541 100644 --- a/src/scroll.c +++ b/src/scroll.c @@ -268,10 +268,10 @@ do_scrolling (struct frame *frame, struct glyph_matrix *current_matrix, # define CHECK_BOUNDS \ do \ { \ - int k; \ - for (k = 0; k < window_size; ++k) \ - xassert (copy_from[k] == -1 \ - || (copy_from[k] >= 0 && copy_from[k] < window_size)); \ + int ck; \ + for (ck = 0; ck < window_size; ++ck) \ + xassert (copy_from[ck] == -1 \ + || (copy_from[ck] >= 0 && copy_from[ck] < window_size)); \ } \ while (0); #endif -- cgit v1.2.1