From: Juanma Barranquero <lekktu@gmail.com>
Date: Wed, 2 May 2012 11:33:49 +0000 (+0200)
Subject: lib-src/emacsclient.c (min): Undef before redefining it.
X-Git-Tag: emacs-24.2.90~471^2~209
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=069a7756f78b308730e862daf0a6711f4cd642db;p=emacs.git

lib-src/emacsclient.c (min): Undef before redefining it.
---

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 007a365708c..f5715cba446 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 d8e9e256584..29504445407 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))