Merge from emacs-24; up to 2014-07-27T18:05:37Z!eliz@gnu.org

[gnu-emacs] / src / gmalloc.c

diff --git a/src/gmalloc.c b/src/gmalloc.c
index 47046cc6747b382375e9384a74f89c1a5a44af79..3456ff0ec6f5c100f443d4b5bdeca6efe9cda7e8 100644 (file)
--- a/src/gmalloc.c
+++ b/src/gmalloc.c
@@ -1303,7 +1303,7 @@ License along with this library.  If not, see <http://www.gnu.org/licenses/>.
    or (US mail) as Mike Haertel c/o Free Software Foundation.  */
 
 #ifndef min
-#define min(A, B) ((A) < (B) ? (A) : (B))
+#define min(a, b) ((a) < (b) ? (a) : (b))
 #endif
 
 /* Debugging hook for realloc.  */