[Emacs-diffs] /srv/bzr/emacs/trunk r108098: lib-src/emacsclient.c (min): Undef before redefining it.

[Juanma Barranquero]

------------------------------------------------------------
revno: 108098
committer: Juanma Barranquero <address@hidden>
branch nick: trunk
timestamp: Wed 2012-05-02 13:33:49 +0200
message:
  lib-src/emacsclient.c (min): Undef before redefining it.
modified:
  lib-src/ChangeLog
  lib-src/emacsclient.c

=== modified file 'lib-src/ChangeLog'
--- a/lib-src/ChangeLog 2012-05-02 10:41:27 +0000
+++ b/lib-src/ChangeLog 2012-05-02 11:33:49 +0000
@@ -1,3 +1,7 @@
+2012-05-02  Juanma Barranquero  <address@hidden>
+
+       * emacsclient.c (min): Undef before redefining it.
+
 2012-05-02  Jim Meyering  <address@hidden>
 
        * emacsclient.c (send_to_emacs): Avoid invalid strcpy upon partial

=== modified file 'lib-src/emacsclient.c'
--- a/lib-src/emacsclient.c     2012-05-02 10:41:27 +0000
+++ b/lib-src/emacsclient.c     2012-05-02 11:33:49 +0000
@@ -119,6 +119,9 @@
 # define IF_LINT(Code) /* empty */
 #endif
 
+#ifdef min
+#undef min
+#endif
 #define min(x, y) (((x) < (y)) ? (x) : (y))