From be4e7c155b6922dd6105f4be57164210c3441f37 Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Wed, 2 May 2012 21:06:50 +0800 Subject: [PATCH] Backport 2012-05-02T11:33:49Z!lekktu@gmail.com from trunk --- lib-src/ChangeLog | 4 ++++ lib-src/emacsclient.c | 3 +++ 2 files changed, 7 insertions(+) diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index 90fd722141b..3a1212c5031 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,3 +1,7 @@ +2012-05-02 Juanma Barranquero + + * emacsclient.c (min): Undef before redefining it. + 2012-05-02 Jim Meyering * emacsclient.c (send_to_emacs): Avoid invalid strcpy upon partial diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c index 931f6d10c5c..c2b0a80c670 100644 --- a/lib-src/emacsclient.c +++ b/lib-src/emacsclient.c @@ -119,6 +119,9 @@ char *(getcwd) (char *, size_t); # define IF_LINT(Code) /* empty */ #endif +#ifdef min +#undef min +#endif #define min(x, y) (((x) < (y)) ? (x) : (y)) -- 2.11.4.GIT