diff options
| author | Juanma Barranquero <[email protected]> | 2012-05-02 13:33:49 +0200 |
|---|---|---|
| committer | Juanma Barranquero <[email protected]> | 2012-05-02 13:33:49 +0200 |
| commit | 069a7756f78b308730e862daf0a6711f4cd642db (patch) | |
| tree | 7438966da9fb9798f72e94b28f532823b3502375 /lib-src | |
| parent | 7b97c76414846f8982b7f96afca4cda5e9ecfcc5 (diff) | |
lib-src/emacsclient.c (min): Undef before redefining it.
Diffstat (limited to 'lib-src')
| -rw-r--r-- | lib-src/ChangeLog | 4 | ||||
| -rw-r--r-- | lib-src/emacsclient.c | 3 |
2 files changed, 7 insertions, 0 deletions
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 <[email protected]> + + * emacsclient.c (min): Undef before redefining it. + 2012-05-02 Jim Meyering <[email protected]> * 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)) |