Commit be4e7c15 authored by Chong Yidong's avatar Chong Yidong
Browse files

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

parent 687d464f
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
......
......@@ -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))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment