diff options
| author |  Craig Tiller <ctiller@google.com> | 2015-10-09 17:09:04 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2015-10-09 17:09:04 -0700 |
| commit | 42cc378a4c2a9c729fe9275d90065edd7af9dc3c (patch) | |
| tree | a1513f74e034f95fe67d8d65b163a7e09a515c9e /src/core/surface/init.c | |
| parent | 3ff27547389509123c4c64e5351d7c7983c8cba2 (diff) | |
| parent | 2b15f1e25ae4aec6ef0de92b7e99e50188eb6438 (diff) | |
Merge branch 'latent-see' into cache-accept-enc
Diffstat (limited to 'src/core/surface/init.c')
| -rw-r--r-- | src/core/surface/init.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/surface/init.c b/src/core/surface/init.c index 95011cab17..715c90a5e1 100644 --- a/src/core/surface/init.c +++ b/src/core/surface/init.c @@ -115,7 +115,7 @@ void grpc_init(void) { gpr_log(GPR_ERROR, "Could not initialize census."); } } - grpc_timers_global_init(); + gpr_timers_global_init(); for (i = 0; i < g_number_of_plugins; i++) { if (g_all_of_the_plugins[i].init != NULL) { g_all_of_the_plugins[i].init(); @@ -133,7 +133,7 @@ void grpc_shutdown(void) { if (--g_initializations == 0) { grpc_iomgr_shutdown(); census_shutdown(); - grpc_timers_global_destroy(); + gpr_timers_global_destroy(); grpc_tracer_shutdown(); grpc_resolver_registry_shutdown(); for (i = 0; i < g_number_of_plugins; i++) { |