? mk.log
Index: ChangeLog
===================================================================
RCS file: /cvsroot/xforms/xforms/ChangeLog,v
retrieving revision 1.62
diff -u -p -r1.62 ChangeLog
--- ChangeLog	20 Nov 2003 11:24:15 -0000	1.62
+++ ChangeLog	21 Nov 2003 10:43:52 -0000
@@ -1,3 +1,15 @@
+2003-11-20  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
+
+	* lib/local.h: do not define HAVE_KP_DEFINE
+
+	* lib/flinternal.h: test directly for X11 version here
+
+	* lib/forms.c (fl_keyboard): 
+	* lib/flcolor.c (fl_mapcolor, fl_dump_state_info): 
+	* lib/xpopup.c (fl_addtopup): 
+	* lib/clock.c (draw_clock): use proper ML_xxx macros instead of
+	bogus names
+
 2003-11-20  Angus Leeming  <angus.leeming@btopenworld.com>
 
 	* lib/flsnprintf.c: remove unused variable 'credits'.
Index: lib/clock.c
===================================================================
RCS file: /cvsroot/xforms/xforms/lib/clock.c,v
retrieving revision 1.5
diff -u -p -r1.5 clock.c
--- lib/clock.c	24 Apr 2003 09:35:34 -0000	1.5
+++ lib/clock.c	21 Nov 2003 10:43:52 -0000
@@ -134,7 +134,7 @@ draw_clock(int type, FL_Coord x, FL_Coor
     FL_POINT xp[5];
     float f1, f2, f3;
 
-#if (FL_DEBUG >= M_DEBUG)
+#if (FL_DEBUG >= ML_DEBUG)
     M_info("DrawClock", "entering");
 #endif
 
@@ -175,7 +175,7 @@ draw_clock(int type, FL_Coord x, FL_Coor
     show_hands(x + 2 + 0.02f * w, y + 2 + 0.02f * h, w, h, FL_RIGHT_BCOL, FL_RIGHT_BCOL);
     show_hands(x, y, w, h, col2, FL_LEFT_BCOL);
 
-#if (FL_DEBUG >= M_DEBUG)
+#if (FL_DEBUG >= ML_DEBUG)
     M_info("DrawClock", "done");
 #endif
 }
Index: lib/flcolor.c
===================================================================
RCS file: /cvsroot/xforms/xforms/lib/flcolor.c,v
retrieving revision 1.7
diff -u -p -r1.7 flcolor.c
--- lib/flcolor.c	20 Nov 2003 10:46:16 -0000	1.7
+++ lib/flcolor.c	21 Nov 2003 10:43:52 -0000
@@ -1023,7 +1023,7 @@ fl_mapcolor(FL_COLOR col, int r, int g, 
 	M_warn("MapColor", "Something is wrong - will proceed");
 
 
-#if (FL_DEBUG >= M_DEBUG)
+#if (FL_DEBUG >= ML_DEBUG)
     M_warn("MapColor", "(%d %d %d)<->(%d %d %d)",
 	   r, g, b, cur_map[j].red, cur_map[j].green, cur_map[j].blue);
 #endif
@@ -1148,7 +1148,7 @@ fl_get_visual_depth(void)
     return fl_state[fl_vmode].depth;
 }
 
-#if (FL_DEBUG >= FL_WARN)	/* { */
+#if (FL_DEBUG >= ML_WARN)	/* { */
 /* print out the current state info. For debugging only */
 void
 fl_dump_state_info(int mode, const char *where)
Index: lib/flinternal.h
===================================================================
RCS file: /cvsroot/xforms/xforms/lib/flinternal.h,v
retrieving revision 1.6
diff -u -p -r1.6 flinternal.h
--- lib/flinternal.h	20 Nov 2003 11:06:49 -0000	1.6
+++ lib/flinternal.h	21 Nov 2003 10:43:52 -0000
@@ -479,7 +479,8 @@ extern int fl_handle_event_callbacks(XEv
 #define XK_PageUp    XK_Prior
 #define XK_PageDn    XK_Next
 
-#ifdef HAVE_KP_DEFINE
+/* some header has XK_XP_Left etc */
+#if XlibSpecificationRelease >= 6
 #define IsHome(k)      (k==XK_Home || k==XK_Begin || k==XK_KP_Home)
 #define IsLeft(k)      (k==XK_Left || k==XK_KP_Left)
 #define IsRight(k)     (k==XK_Right|| k==XK_KP_Right)
Index: lib/forms.c
===================================================================
RCS file: /cvsroot/xforms/xforms/lib/forms.c,v
retrieving revision 1.8
diff -u -p -r1.8 forms.c
--- lib/forms.c	9 Sep 2003 00:28:25 -0000	1.8
+++ lib/forms.c	21 Nov 2003 10:43:52 -0000
@@ -1310,7 +1310,7 @@ fl_keyboard(FL_FORM * form, int key, FL_
     else if (special->wantkey == FL_KEY_ALL)
 	fl_handle_object(special, FL_KEYBOARD, x, y, key, xev);
 
-#if FL_DEBUG >= ML_INFO
+#if FL_DEBUG >= ML_INFO1
     M_info("KeyBoard", "(%d %d)pushing %d to %s\n", x, y, key, special->label);
 #endif
 }
Index: lib/local.h
===================================================================
RCS file: /cvsroot/xforms/xforms/lib/local.h,v
retrieving revision 1.6
diff -u -p -r1.6 local.h
--- lib/local.h	8 Sep 2003 23:48:36 -0000	1.6
+++ lib/local.h	21 Nov 2003 10:43:52 -0000
@@ -69,11 +69,6 @@ extern int gettimeofday(struct timeval *
 
 /********* End of Configurable stuff ***********/
 
-/* some header has XK_XP_Left etc */
-#if (XlibSpecificationRelease>=6)
-#define HAVE_KP_DEFINE 1
-#endif
-
 #ifndef FL_PATH_MAX
 #ifdef PATH_MAX
 #define FL_PATH_MAX   PATH_MAX
Index: lib/xpopup.c
===================================================================
RCS file: /cvsroot/xforms/xforms/lib/xpopup.c,v
retrieving revision 1.8
diff -u -p -r1.8 xpopup.c
--- lib/xpopup.c	9 Sep 2003 00:28:25 -0000	1.8
+++ lib/xpopup.c	21 Nov 2003 10:43:52 -0000
@@ -530,7 +530,7 @@ fl_addtopup(int n, const char *str,...)
 
     if (n >= 0 && n < fl_maxpup)
     {
-#if (FL_DEBUG >= M_DEBUG)
+#if (FL_DEBUG >= ML_DEBUG)
 	{
 	    char *q = fl_strdup(str), *p;
 	    while ((p = strchr(q, '%')))