diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-04-15 18:38:14 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-04-15 18:38:14 -0700 |
| commit | 3dc427cdf2fc6e7a077104f3aecf779d41d319b7 (patch) | |
| tree | 606a93c0bf2dbdd3358eec0d62b22b62d5b0af73 | |
| parent | b2a31ded41b9536fcf26f62a5e8c36756b964c42 (diff) | |
| download | emacs-3dc427cdf2fc6e7a077104f3aecf779d41d319b7.tar.gz | |
* xlwmenu.c (MINL): Define only if not emacs.
| -rw-r--r-- | lwlib/ChangeLog | 1 | ||||
| -rw-r--r-- | lwlib/xlwmenu.c | 2 |
2 files changed, 3 insertions, 0 deletions
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) |