aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGerd Moellmann2000-12-28 10:12:26 +0000
committerGerd Moellmann2000-12-28 10:12:26 +0000
commitf1d2ce7f2f7067d538ac590df4e9f4f0d2738dab (patch)
tree65110cc3a4617fcce786b22503a85b0686906d73 /src
parent2d5912c169a99a491d4384b50729dfdbab8e2f40 (diff)
downloademacs-f1d2ce7f2f7067d538ac590df4e9f4f0d2738dab.tar.gz
emacs-f1d2ce7f2f7067d538ac590df4e9f4f0d2738dab.zip
Use #if GLYPH_DEBUG instead of #ifdef GLYPH_DEBUG.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog2
-rw-r--r--src/dispnew.c2
-rw-r--r--src/xfns.c8
3 files changed, 7 insertions, 5 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 13000ca9231..8563a8fdbe2 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
12000-12-28 Gerd Moellmann <gerd@gnu.org> 12000-12-28 Gerd Moellmann <gerd@gnu.org>
2 2
3 * xfns.c: Use #if GLYPH_DEBUG instead of #ifdef GLYPH_DEBUG.
4
3 * dispnew.c: Use #if GLYPH_DEBUG instead of #ifdef GLYPH_DEBUG. 5 * dispnew.c: Use #if GLYPH_DEBUG instead of #ifdef GLYPH_DEBUG.
4 6
52000-12-28 Kenichi Handa <handa@etl.go.jp> 72000-12-28 Kenichi Handa <handa@etl.go.jp>
diff --git a/src/dispnew.c b/src/dispnew.c
index ed512a03ea9..c72ed6be40d 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -141,7 +141,7 @@ static void adjust_glyph_matrix P_ ((struct window *, struct glyph_matrix *,
141 int, int, struct dim)); 141 int, int, struct dim));
142static void change_frame_size_1 P_ ((struct frame *, int, int, int, int, int)); 142static void change_frame_size_1 P_ ((struct frame *, int, int, int, int, int));
143static void swap_glyph_pointers P_ ((struct glyph_row *, struct glyph_row *)); 143static void swap_glyph_pointers P_ ((struct glyph_row *, struct glyph_row *));
144#ifdef GLYPH_DEBUG 144#if GLYPH_DEBUG
145static int glyph_row_slice_p P_ ((struct glyph_row *, struct glyph_row *)); 145static int glyph_row_slice_p P_ ((struct glyph_row *, struct glyph_row *));
146#endif 146#endif
147static void fill_up_frame_row_with_spaces P_ ((struct glyph_row *, int)); 147static void fill_up_frame_row_with_spaces P_ ((struct glyph_row *, int));
diff --git a/src/xfns.c b/src/xfns.c
index 11c45e7ffde..6e8931b42d7 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -255,7 +255,7 @@ extern Lisp_Object Vwindow_system_version;
255 255
256Lisp_Object Qface_set_after_frame_default; 256Lisp_Object Qface_set_after_frame_default;
257 257
258#ifdef GLYPH_DEBUG 258#if GLYPH_DEBUG
259int image_cache_refcount, dpyinfo_refcount; 259int image_cache_refcount, dpyinfo_refcount;
260#endif 260#endif
261 261
@@ -4043,7 +4043,7 @@ unwind_create_frame (frame)
4043 /* If frame is ``official'', nothing to do. */ 4043 /* If frame is ``official'', nothing to do. */
4044 if (!CONSP (Vframe_list) || !EQ (XCAR (Vframe_list), frame)) 4044 if (!CONSP (Vframe_list) || !EQ (XCAR (Vframe_list), frame))
4045 { 4045 {
4046#ifdef GLYPH_DEBUG 4046#if GLYPH_DEBUG
4047 struct x_display_info *dpyinfo = FRAME_X_DISPLAY_INFO (f); 4047 struct x_display_info *dpyinfo = FRAME_X_DISPLAY_INFO (f);
4048#endif 4048#endif
4049 4049
@@ -4158,7 +4158,7 @@ This function is an internal primitive--use `make-frame' instead.")
4158 f->icon_name = Qnil; 4158 f->icon_name = Qnil;
4159 4159
4160 FRAME_X_DISPLAY_INFO (f) = dpyinfo; 4160 FRAME_X_DISPLAY_INFO (f) = dpyinfo;
4161#ifdef GLYPH_DEBUG 4161#if GLYPH_DEBUG
4162 image_cache_refcount = FRAME_X_IMAGE_CACHE (f)->refcount; 4162 image_cache_refcount = FRAME_X_IMAGE_CACHE (f)->refcount;
4163 dpyinfo_refcount = dpyinfo->reference_count; 4163 dpyinfo_refcount = dpyinfo->reference_count;
4164#endif /* GLYPH_DEBUG */ 4164#endif /* GLYPH_DEBUG */
@@ -10440,7 +10440,7 @@ x_create_tip_frame (dpyinfo, parms)
10440 f->output_data.x->scroll_bar_background_pixel = -1; 10440 f->output_data.x->scroll_bar_background_pixel = -1;
10441 f->icon_name = Qnil; 10441 f->icon_name = Qnil;
10442 FRAME_X_DISPLAY_INFO (f) = dpyinfo; 10442 FRAME_X_DISPLAY_INFO (f) = dpyinfo;
10443#ifdef GLYPH_DEBUG 10443#if GLYPH_DEBUG
10444 image_cache_refcount = FRAME_X_IMAGE_CACHE (f)->refcount; 10444 image_cache_refcount = FRAME_X_IMAGE_CACHE (f)->refcount;
10445 dpyinfo_refcount = dpyinfo->reference_count; 10445 dpyinfo_refcount = dpyinfo->reference_count;
10446#endif /* GLYPH_DEBUG */ 10446#endif /* GLYPH_DEBUG */