[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r116956: Correct merge
From: |
Daniel Colascione |
Subject: |
[Emacs-diffs] trunk r116956: Correct merge |
Date: |
Tue, 08 Apr 2014 12:40:15 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 116956
revision-id: address@hidden
parent: address@hidden
committer: Daniel Colascione <address@hidden>
branch nick: trunk
timestamp: Tue 2014-04-08 05:39:40 -0700
message:
Correct merge
modified:
src/alloc.c alloc.c-20091113204419-o5vbwnq5f7feedwu-252
=== modified file 'src/alloc.c'
--- a/src/alloc.c 2014-04-08 12:34:30 +0000
+++ b/src/alloc.c 2014-04-08 12:39:40 +0000
@@ -6895,14 +6895,14 @@
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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r116956: Correct merge,
Daniel Colascione <=