diff --git a/src/ChangeLog b/src/ChangeLog
index 13000ca9231914f6318dbb5b24318b99a650083c..8563a8fdbe2bdbb36fd07df1b979c96f97d671ba 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
 2000-12-28  Gerd Moellmann  <gerd@gnu.org>
 
+	* xfns.c: Use #if GLYPH_DEBUG instead of #ifdef GLYPH_DEBUG.
+
 	* dispnew.c: Use #if GLYPH_DEBUG instead of #ifdef GLYPH_DEBUG.
 
 2000-12-28  Kenichi Handa  <handa@etl.go.jp>
diff --git a/src/dispnew.c b/src/dispnew.c
index ed512a03ea96181e2242a34564471b2a1c171427..c72ed6be40d7f28aa08281f40705d2e79813295d 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -141,7 +141,7 @@ static void adjust_glyph_matrix P_ ((struct window *, struct glyph_matrix *,
 				     int, int, struct dim));
 static void change_frame_size_1 P_ ((struct frame *, int, int, int, int, int));
 static void swap_glyph_pointers P_ ((struct glyph_row *, struct glyph_row *));
-#ifdef GLYPH_DEBUG
+#if GLYPH_DEBUG
 static int glyph_row_slice_p P_ ((struct glyph_row *, struct glyph_row *));
 #endif
 static void fill_up_frame_row_with_spaces P_ ((struct glyph_row *, int));
diff --git a/src/xfns.c b/src/xfns.c
index 11c45e7ffde4c1a4eb6f15e196af416e0715a7c8..6e8931b42d703fe9db7e154f881b09ca7277c4ad 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -255,7 +255,7 @@ extern Lisp_Object Vwindow_system_version;
 
 Lisp_Object Qface_set_after_frame_default;
 
-#ifdef GLYPH_DEBUG
+#if GLYPH_DEBUG
 int image_cache_refcount, dpyinfo_refcount;
 #endif
 
@@ -4043,7 +4043,7 @@ unwind_create_frame (frame)
   /* If frame is ``official'', nothing to do.  */
   if (!CONSP (Vframe_list) || !EQ (XCAR (Vframe_list), frame))
     {
-#ifdef GLYPH_DEBUG
+#if GLYPH_DEBUG
       struct x_display_info *dpyinfo = FRAME_X_DISPLAY_INFO (f);
 #endif
       
@@ -4158,7 +4158,7 @@ This function is an internal primitive--use `make-frame' instead.")
     f->icon_name = Qnil;
 
   FRAME_X_DISPLAY_INFO (f) = dpyinfo;
-#ifdef GLYPH_DEBUG
+#if GLYPH_DEBUG
   image_cache_refcount = FRAME_X_IMAGE_CACHE (f)->refcount;
   dpyinfo_refcount = dpyinfo->reference_count;
 #endif /* GLYPH_DEBUG */
@@ -10440,7 +10440,7 @@ x_create_tip_frame (dpyinfo, parms)
   f->output_data.x->scroll_bar_background_pixel = -1;
   f->icon_name = Qnil;
   FRAME_X_DISPLAY_INFO (f) = dpyinfo;
-#ifdef GLYPH_DEBUG
+#if GLYPH_DEBUG
   image_cache_refcount = FRAME_X_IMAGE_CACHE (f)->refcount;
   dpyinfo_refcount = dpyinfo->reference_count;
 #endif /* GLYPH_DEBUG */