--- a/src/ChangeLog	Fri Apr 09 12:01:14 2010 +0200
+++ b/src/ChangeLog	Fri Apr 09 14:51:11 2010 +0200
@@ -1,3 +1,14 @@
+2010-04-09  Didier Verna  <didier@xemacs.org>
+
+	* fontcolor-xlike-inc.c (DEBUG_FONTS2):
+	* fontcolor-xlike-inc.c (DEBUG_FONTS3):
+	* fontcolor-xlike-inc.c (DEBUG_FONTS4):
+	* fontcolor-xlike-inc.c (DEBUG_FONTS_LISP1):
+	* fontcolor-xlike-inc.c (DEBUG_FONTS_LISP2):
+	* fontcolor-xlike-inc.c (DEBUG_FONTS_LISP3):
+	* fontcolor-xlike-inc.c (DEBUG_FONTS_LISP4): Conditionalize
+	definitions on DEBUG_XEMACS, provide empty definitions otherwise.
+
 2010-04-06  Ben Wing  <ben@xemacs.org>
 
 	* elhash.c (Feq_hash):

--- a/src/fontcolor-xlike-inc.c	Fri Apr 09 12:01:14 2010 +0200
+++ b/src/fontcolor-xlike-inc.c	Fri Apr 09 14:51:11 2010 +0200
@@ -34,53 +34,64 @@
 
 #include "console-xlike-inc.h"
 
-#define DEBUG_FONTS1(format, arg)		\
+#ifdef DEBUG_XEMACS
+# define DEBUG_FONTS1(format, arg)		\
 do {						\
   if (debug_x_fonts)				\
     debug_out (format, arg);			\
 } while (0)
 
-#define DEBUG_FONTS2(format, arg1, arg2)	\
+# define DEBUG_FONTS2(format, arg1, arg2)	\
 do {						\
   if (debug_x_fonts)				\
     debug_out (format, arg1, arg2);		\
 } while (0)
 
-#define DEBUG_FONTS3(format, arg1, arg2, arg3)	\
+# define DEBUG_FONTS3(format, arg1, arg2, arg3)	\
 do {						\
   if (debug_x_fonts)				\
     debug_out (format, arg1, arg2, arg3);	\
 } while (0)
 
-#define DEBUG_FONTS4(format, arg1, arg2, arg3, arg4)	\
+# define DEBUG_FONTS4(format, arg1, arg2, arg3, arg4)	\
 do {							\
   if (debug_x_fonts)					\
     debug_out (format, arg1, arg2, arg3, arg4);		\
 } while (0)
 
-#define DEBUG_FONTS_LISP1(format, arg)		\
+# define DEBUG_FONTS_LISP1(format, arg)		\
 do {						\
   if (debug_x_fonts)				\
     debug_out_lisp (format, 1, arg);		\
 } while (0)
 
-#define DEBUG_FONTS_LISP2(format, arg1, arg2)	\
+# define DEBUG_FONTS_LISP2(format, arg1, arg2)	\
 do {						\
   if (debug_x_fonts)				\
     debug_out_lisp (format, 2, arg1, arg2);	\
 } while (0)
 
-#define DEBUG_FONTS_LISP3(format, arg1, arg2, arg3)	\
+# define DEBUG_FONTS_LISP3(format, arg1, arg2, arg3)	\
 do {							\
   if (debug_x_fonts)					\
     debug_out_lisp (format, 3, arg1, arg2, arg3);	\
 } while (0)
 
-#define DEBUG_FONTS_LISP4(format, arg1, arg2, arg3, arg4)	\
+# define DEBUG_FONTS_LISP4(format, arg1, arg2, arg3, arg4)	\
 do {								\
   if (debug_x_fonts)						\
     debug_out_lisp (format, 4, arg1, arg2, arg3, arg4);		\
 } while (0)
+#else /* not DEBUG_XEMACS */
+# define DEBUG_FONTS1(format, arg)
+# define DEBUG_FONTS2(format, arg1, arg2)
+# define DEBUG_FONTS3(format, arg1, arg2, arg3)
+# define DEBUG_FONTS4(format, arg1, arg2, arg3, arg4)
+# define DEBUG_FONTS_LISP1(format, arg)
+# define DEBUG_FONTS_LISP2(format, arg1, arg2)
+# define DEBUG_FONTS_LISP3(format, arg1, arg2, arg3)
+# define DEBUG_FONTS_LISP4(format, arg1, arg2, arg3, arg4)
+#endif
 
 #ifdef MULE