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

069a7756 · Juanma Barranquero · 7b97c764 · 069a7756 · 069a7756
Commit 069a7756 authored May 02, 2012 by Juanma Barranquero
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 0 deletions

lib-src/ChangeLog lib-src/ChangeLog +4 -0

lib-src/emacsclient.c lib-src/emacsclient.c +3 -0

No files found.
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
+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

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