diff options
| author |  Yash Tibrewal <yashkt@google.com> | 2017-11-30 10:54:42 -0800 |
|---|---|---|
| committer | Yash Tibrewal <yashkt@google.com> | 2017-11-30 10:54:42 -0800 |
| commit | 10f2790f7fedb7b54889c9ba8297a9e127edb143 (patch) | |
| tree | 899151af9bc4ab60aac48ab67de4e84c1cd8062a /include/grpc/support | |
| parent | c354269ba7bd1f6dfe9c86ba18f38fc8e346dcfc (diff) | |
| parent | 5f662537deb01539a204273977c7e32394fc3454 (diff) | |
Merge branch 'master' into execctx
Diffstat (limited to 'include/grpc/support')
| -rw-r--r-- | include/grpc/support/alloc.h | 2 | ||||
| -rw-r--r-- | include/grpc/support/log.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/grpc/support/alloc.h b/include/grpc/support/alloc.h index 31cb225638..c559198237 100644 --- a/include/grpc/support/alloc.h +++ b/include/grpc/support/alloc.h @@ -58,7 +58,7 @@ GPRAPI void gpr_free_aligned(void* ptr); GPRAPI void gpr_set_allocation_functions(gpr_allocation_functions functions); /** Return the family of allocation functions currently in effect. */ -GPRAPI gpr_allocation_functions gpr_get_allocation_functions(); +GPRAPI gpr_allocation_functions gpr_get_allocation_functions(void); #ifdef __cplusplus } diff --git a/include/grpc/support/log.h b/include/grpc/support/log.h index 497cca9081..9cce4b1ae7 100644 --- a/include/grpc/support/log.h +++ b/include/grpc/support/log.h @@ -68,7 +68,7 @@ GPRAPI void gpr_log_message(const char* file, int line, /** Set global log verbosity */ GPRAPI void gpr_set_log_verbosity(gpr_log_severity min_severity_to_print); -GPRAPI void gpr_log_verbosity_init(); +GPRAPI void gpr_log_verbosity_init(void); /** Log overrides: applications can use this API to intercept logging calls and use their own implementations */ |