aboutsummaryrefslogtreecommitdiffstats
path: root/src/dispextern.h
diff options
context:
space:
mode:
authorPaul Eggert2011-06-22 11:15:23 -0700
committerPaul Eggert2011-06-22 11:15:23 -0700
commit85fece3ec2ac88faec0ae3da5417d6e60b10cc63 (patch)
treea6a72b462548f9f78a28d9508299582db361d87b /src/dispextern.h
parent94a807ac4e785c6387ddac4380a924a7859ab3f2 (diff)
downloademacs-85fece3ec2ac88faec0ae3da5417d6e60b10cc63.tar.gz
emacs-85fece3ec2ac88faec0ae3da5417d6e60b10cc63.zip
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.
Diffstat (limited to 'src/dispextern.h')
-rw-r--r--src/dispextern.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/dispextern.h b/src/dispextern.h
index 02f1e5314aa..57fa09d3bfc 100644
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -151,7 +151,7 @@ enum window_part
151 151
152#if GLYPH_DEBUG 152#if GLYPH_DEBUG
153 153
154extern int trace_redisplay_p; 154extern int trace_redisplay_p EXTERNALLY_VISIBLE;
155#include <stdio.h> 155#include <stdio.h>
156 156
157#define TRACE(X) \ 157#define TRACE(X) \
@@ -3010,7 +3010,7 @@ extern EMACS_INT compute_display_string_end (EMACS_INT);
3010#ifdef HAVE_WINDOW_SYSTEM 3010#ifdef HAVE_WINDOW_SYSTEM
3011 3011
3012#if GLYPH_DEBUG 3012#if GLYPH_DEBUG
3013extern void dump_glyph_string (struct glyph_string *); 3013extern void dump_glyph_string (struct glyph_string *) EXTERNALLY_VISIBLE;
3014#endif 3014#endif
3015 3015
3016extern void x_get_glyph_overhangs (struct glyph *, struct frame *, 3016extern void x_get_glyph_overhangs (struct glyph *, struct frame *,