diff options
| author | Dmitry Antipov <dmantipov@yandex.ru> | 2012-06-28 11:50:50 +0400 |
|---|---|---|
| committer | Dmitry Antipov <dmantipov@yandex.ru> | 2012-06-28 11:50:50 +0400 |
| commit | e509cfa6065d20e0d8d2b3ce9ac544355521bc89 (patch) | |
| tree | 49bb60b82e50f987bdaa095963d07b1c66a5a109 /src/xfns.c | |
| parent | a54e2c050b9cf161cbccc3dd4628f8ef6b64f519 (diff) | |
| download | emacs-e509cfa6065d20e0d8d2b3ce9ac544355521bc89.tar.gz | |
* configure.in: Add glyphs category to --enable-checking option.
(GLYPH_DEBUG): Define if glyphs debugging is enabled.
* src/dispextern.h (GLYPH_DEBUG): Now defined in config.h if
enabled with --enable-checking=[all,glyphs] configure option.
Fix GLYPH_DEBUG usage assuming that it may be undefined,
adjust comments accordingly.
* src/dispnew.c: Fix GLYPH_DEBUG usage assuming that it may be
undefined, adjust comments accordingly.
* src/image.c: Likewise.
* src/scroll.c: Likewise.
* src/w32fns.c: Likewise.
* src/w32term.c: Likewise.
* src/xdisp.c: Likewise.
* src/xfaces.c: Likewise.
* src/xfns.c: Likewise.
* src/xterm.c: Likewise.
Diffstat (limited to 'src/xfns.c')
| -rw-r--r-- | src/xfns.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/xfns.c b/src/xfns.c index 00cf9f8e081..13c7070e229 100644 --- a/src/xfns.c +++ b/src/xfns.c @@ -136,7 +136,7 @@ static Lisp_Object Qundefined_color; static Lisp_Object Qcompound_text, Qcancel_timer; Lisp_Object Qfont_param; -#if GLYPH_DEBUG +#ifdef GLYPH_DEBUG static ptrdiff_t image_cache_refcount; static int dpyinfo_refcount; #endif @@ -2914,14 +2914,14 @@ unwind_create_frame (Lisp_Object frame) /* If frame is ``official'', nothing to do. */ if (NILP (Fmemq (frame, Vframe_list))) { -#if GLYPH_DEBUG && defined ENABLE_CHECKING +#if defined GLYPH_DEBUG && defined ENABLE_CHECKING struct x_display_info *dpyinfo = FRAME_X_DISPLAY_INFO (f); #endif x_free_frame_resources (f); free_glyphs (f); -#if GLYPH_DEBUG +#if defined GLYPH_DEBUG && defined ENABLE_CHECKING /* Check that reference counts are indeed correct. */ eassert (dpyinfo->reference_count == dpyinfo_refcount); eassert (dpyinfo->terminal->image_cache->refcount == image_cache_refcount); @@ -3296,7 +3296,7 @@ This function is an internal primitive--use `make-frame' instead. */) "scrollBarBackground", "ScrollBarBackground", 0); -#if GLYPH_DEBUG +#ifdef GLYPH_DEBUG image_cache_refcount = FRAME_IMAGE_CACHE (f) ? FRAME_IMAGE_CACHE (f)->refcount : 0; dpyinfo_refcount = dpyinfo->reference_count; @@ -4730,7 +4730,7 @@ x_create_tip_frame (struct x_display_info *dpyinfo, x_default_parameter (f, parms, Qborder_color, build_string ("black"), "borderColor", "BorderColor", RES_TYPE_STRING); -#if GLYPH_DEBUG +#ifdef GLYPH_DEBUG image_cache_refcount = FRAME_IMAGE_CACHE (f) ? FRAME_IMAGE_CACHE (f)->refcount : 0; dpyinfo_refcount = dpyinfo->reference_count; |