diff options
| author | Daniel Colascione | 2014-04-08 05:39:40 -0700 |
|---|---|---|
| committer | Daniel Colascione | 2014-04-08 05:39:40 -0700 |
| commit | 1e1a3a324856cf7480030b6dbd7f4476c5130ad9 (patch) | |
| tree | 56e5fc69db46b76ce306f83d31a2db4dd416cb23 /src/alloc.c | |
| parent | a237d879b98cc655382e2dbd83c1a05208c19db8 (diff) | |
| download | emacs-1e1a3a324856cf7480030b6dbd7f4476c5130ad9.tar.gz emacs-1e1a3a324856cf7480030b6dbd7f4476c5130ad9.zip | |
Correct merge
Diffstat (limited to 'src/alloc.c')
| -rw-r--r-- | src/alloc.c | 4 |
1 files 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) | |||
| 6895 | 6895 | ||
| 6896 | rec = &suspicious_free_history[suspicious_free_history_index++]; | 6896 | rec = &suspicious_free_history[suspicious_free_history_index++]; |
| 6897 | if (suspicious_free_history_index == | 6897 | if (suspicious_free_history_index == |
| 6898 | EARRAYSIZE (suspicious_free_history)) | 6898 | ARRAYELTS (suspicious_free_history)) |
| 6899 | { | 6899 | { |
| 6900 | suspicious_free_history_index = 0; | 6900 | suspicious_free_history_index = 0; |
| 6901 | } | 6901 | } |
| 6902 | 6902 | ||
| 6903 | memset (rec, 0, sizeof (*rec)); | 6903 | memset (rec, 0, sizeof (*rec)); |
| 6904 | rec->suspicious_object = ptr; | 6904 | rec->suspicious_object = ptr; |
| 6905 | backtrace (&rec->backtrace[0], EARRAYSIZE (rec->backtrace)); | 6905 | backtrace (&rec->backtrace[0], ARRAYELTS (rec->backtrace)); |
| 6906 | } | 6906 | } |
| 6907 | 6907 | ||
| 6908 | static void | 6908 | static void |