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

2 files changed, 7 insertions, 0 deletions

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))