diff options
| author | Chong Yidong <cyd@gnu.org> | 2012-05-02 21:06:50 +0800 |
|---|---|---|
| committer | Chong Yidong <cyd@gnu.org> | 2012-05-02 21:06:50 +0800 |
| commit | be4e7c155b6922dd6105f4be57164210c3441f37 (patch) | |
| tree | 11f830d44f8260192156887a8cf6b252bef2e839 /lib-src | |
| parent | 687d464f5c60cfe135436dab3dc29620ea8d1f95 (diff) | |
| download | emacs-be4e7c155b6922dd6105f4be57164210c3441f37.tar.gz emacs-be4e7c155b6922dd6105f4be57164210c3441f37.tar.bz2 emacs-be4e7c155b6922dd6105f4be57164210c3441f37.zip | |
Backport 2012-05-02T11:33:49Z!lekktu@gmail.com from trunk
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 90fd722141b..3a1212c5031 100644 --- 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 931f6d10c5c..c2b0a80c670 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)) |