From 069a7756f78b308730e862daf0a6711f4cd642db Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Wed, 2 May 2012 13:33:49 +0200 Subject: lib-src/emacsclient.c (min): Undef before redefining it. --- lib-src/ChangeLog | 4 ++++ lib-src/emacsclient.c | 3 +++ 2 files changed, 7 insertions(+) (limited to 'lib-src') diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index 007a365708..f5715cba44 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,3 +1,7 @@ +2012-05-02 Juanma Barranquero + + * emacsclient.c (min): Undef before redefining it. + 2012-05-02 Jim Meyering * emacsclient.c (send_to_emacs): Avoid invalid strcpy upon partial diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c index d8e9e25658..2950444540 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)) -- cgit v1.2.3