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

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 007a365708c7c32f1416c3181c1af1e02c661eea..f5715cba44641d981865e67f154b0772b1cad2cc 100644 (file)
--- 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 d8e9e256584db7ad2ef0f12e7cc545f71be17147..29504445407d99b7c6a4fd66a7983540e4c8b8d2 100644 (file)
--- 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))
 
 \f