diff options
| author |  ncteisen <ncteisen@gmail.com> | 2017-11-28 14:12:25 -0800 |
|---|---|---|
| committer | ncteisen <ncteisen@gmail.com> | 2017-11-28 14:12:25 -0800 |
| commit | aa358d5e43d0a23301f79b1dcff292a480980769 (patch) | |
| tree | c2ab081b366c5fe48bea7c4fb0ada48cf1c72594 /include | |
| parent | fe354eb8070ccf34e88ee9e0db3853a38e2fdbcf (diff) | |
| parent | d39d007e8f095f14b3e2bf18ea6e6c410546e609 (diff) | |
Merge branch 'master' of https://github.com/grpc/grpc into no-more-extern-c
Diffstat (limited to 'include')
| -rw-r--r-- | include/grpc/grpc_security.h | 2 | ||||
| -rw-r--r-- | include/grpc/support/alloc.h | 2 | ||||
| -rw-r--r-- | include/grpc/support/log.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/include/grpc/grpc_security.h b/include/grpc/grpc_security.h index 7e87217de7..bae07ac309 100644 --- a/include/grpc/grpc_security.h +++ b/include/grpc/grpc_security.h @@ -185,7 +185,7 @@ GRPCAPI grpc_call_credentials* grpc_composite_call_credentials_create( GRPCAPI grpc_call_credentials* grpc_google_compute_engine_credentials_create( void* reserved); -GRPCAPI gpr_timespec grpc_max_auth_token_lifetime(); +GRPCAPI gpr_timespec grpc_max_auth_token_lifetime(void); /** Creates a JWT credentials object. May return NULL if the input is invalid. - json_key is the JSON key string containing the client's private key. 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 */ |