From 1e1a3a324856cf7480030b6dbd7f4476c5130ad9 Mon Sep 17 00:00:00 2001 From: Daniel Colascione Date: Tue, 8 Apr 2014 05:39:40 -0700 Subject: [PATCH] Correct merge --- src/alloc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 -- 2.39.2