From: Chong Yidong <cyd@gnu.org>
Date: Wed, 2 May 2012 13:06:50 +0000 (+0800)
Subject: Backport 2012-05-02T11:33:49Z!lekktu@gmail.com from trunk
X-Git-Tag: emacs-24.0.97~66
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=be4e7c155b6922dd6105f4be57164210c3441f37;p=emacs.git

Backport 2012-05-02T11:33:49Z!lekktu@gmail.com from trunk
---

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  <lekktu@gmail.com>
+
+	* emacsclient.c (min): Undef before redefining it.
+
 2012-05-02  Jim Meyering  <jim@meyering.net>
 
 	* 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))