mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00
Code Issues Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
Juanma Barranquero 2012-05-02 13:33:49 +02:00
parent 7b97c76414
commit 069a7756f7
2 changed files with 7 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib-src/ChangeLog
View file

@ -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> 2012-05-02 Jim Meyering <jim@meyering.net>
* emacsclient.c (send_to_emacs): Avoid invalid strcpy upon partial * emacsclient.c (send_to_emacs): Avoid invalid strcpy upon partial

3
lib-src/emacsclient.c
View file

@ -119,6 +119,9 @@ char *(getcwd) (char *, size_t);
# define IF_LINT(Code) /* empty */ # define IF_LINT(Code) /* empty */
#endif #endif
#ifdef min
#undef min
#endif
#define min(x, y) (((x) < (y)) ? (x) : (y)) #define min(x, y) (((x) < (y)) ? (x) : (y))