* xlwmenu.c (MINL): Define only if not emacs.

diff --git a/lwlib/ChangeLog b/lwlib/ChangeLog
index f083f64990acec0727199ef479e1ee83c765cac4..f098b6d0ad6d7b3457b12bfb559fff8fdd68db37 100644 (file)
--- a/lwlib/ChangeLog
+++ b/lwlib/ChangeLog
@@ -1,6 +1,7 @@
 2011-04-16  Paul Eggert  <eggert@cs.ucla.edu>
 
        * xlwmenu.c (XlwMenuSetValues): Rename/ move locals to avoid shadowing.
+       (MINL): Define only if not emacs.
 
 2011-03-07  Chong Yidong  <cyd@stupidchicken.com>
 

diff --git a/lwlib/xlwmenu.c b/lwlib/xlwmenu.c
index 507d1f168af8756002083d1cb9daa7501a2dcd5a..e9ec604ae7f124524069bec70bbfebc8c33014e2 100644 (file)
--- a/lwlib/xlwmenu.c
+++ b/lwlib/xlwmenu.c
@@ -1693,8 +1693,10 @@ release_drawing_gcs (XlwMenuWidget mw)
   mw->menu.background_gc = (GC) -1;
 }
 
+#ifndef emacs
 #define MINL(x,y) ((((unsigned long) (x)) < ((unsigned long) (y))) \
                   ? ((unsigned long) (x)) : ((unsigned long) (y)))
+#endif
 
 static void
 make_shadow_gcs (XlwMenuWidget mw)