From: Daniel Colascione <dancol@dancol.org>
Date: Tue, 8 Apr 2014 12:39:40 +0000 (-0700)
Subject: Correct merge
X-Git-Tag: emacs-25.0.90~2612^2~709^2~1082
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1e1a3a324856cf7480030b6dbd7f4476c5130ad9;p=emacs.git

Correct merge
---

diff --git a/src/alloc.c b/src/alloc.c
index 15bfbbbb1b7..b2b159a7952 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -6895,14 +6895,14 @@ note_suspicious_free (void* ptr)
 
   rec = &suspicious_free_history[suspicious_free_history_index++];
   if (suspicious_free_history_index ==
-      EARRAYSIZE (suspicious_free_history))
+      ARRAYELTS (suspicious_free_history))
     {
       suspicious_free_history_index = 0;
     }
 
   memset (rec, 0, sizeof (*rec));
   rec->suspicious_object = ptr;
-  backtrace (&rec->backtrace[0], EARRAYSIZE (rec->backtrace));
+  backtrace (&rec->backtrace[0], ARRAYELTS (rec->backtrace));
 }
 
 static void