From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sat, 16 Apr 2011 01:38:14 +0000 (-0700)
Subject: * xlwmenu.c (MINL): Define only if not emacs.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~268^2~56
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1fbb4609138cca32a9bac72561f63f22b0f26469;p=emacs.git

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

diff --git a/lwlib/ChangeLog b/lwlib/ChangeLog
index f083f64990a..f098b6d0ad6 100644
--- 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 507d1f168af..e9ec604ae7f 100644
--- 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)