diff options
| author |  Mark D. Roth <roth@google.com> | 2017-03-01 10:58:13 -0800 |
|---|---|---|
| committer | Mark D. Roth <roth@google.com> | 2017-03-01 10:58:13 -0800 |
| commit | 02612c163e949ed70a399cf9dd311457bb29c902 (patch) | |
| tree | 7979cb4824a3190203c7c2bbe035bbdfa20bc5ac /test/core/util/memory_counters.c | |
| parent | 95039b57dc812dff2c0edfd80f6c09179afabc97 (diff) | |
| parent | f1666d48244143ddaf463523030ee76cc0fe691c (diff) | |
Merge remote-tracking branch 'upstream/master' into retry_throttle
Diffstat (limited to 'test/core/util/memory_counters.c')
| -rw-r--r-- | test/core/util/memory_counters.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/core/util/memory_counters.c b/test/core/util/memory_counters.c index fd6770bd49..7c8b620f34 100644 --- a/test/core/util/memory_counters.c +++ b/test/core/util/memory_counters.c @@ -96,8 +96,8 @@ static void guard_free(void *vptr) { g_old_allocs.free_fn(ptr); } -struct gpr_allocation_functions g_guard_allocs = {guard_malloc, guard_realloc, - guard_free}; +struct gpr_allocation_functions g_guard_allocs = {guard_malloc, NULL, + guard_realloc, guard_free}; void grpc_memory_counters_init() { memset(&g_memory_counters, 0, sizeof(g_memory_counters)); |