diff options
| author |  Craig Tiller <ctiller@google.com> | 2016-06-06 08:38:50 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2016-06-06 08:38:50 -0700 |
| commit | d925c93047d94456e5efb475d07a9c74f3de672d (patch) | |
| tree | fa46677dae0e8f7518c5555d773e8060ec58d20b /src/core/lib/security | |
| parent | 115ae4004ca40835202138a8a295c796a4762f7e (diff) | |
| parent | 37e26d922fc443b67df50abd8b11288eba2920cd (diff) | |
Merge github.com:grpc/grpc into error
Diffstat (limited to 'src/core/lib/security')
| -rw-r--r-- | src/core/lib/security/credentials/google_default/credentials_windows.c (renamed from src/core/lib/security/credentials/google_default/credentials_win32.c) | 4 | ||||
| -rw-r--r-- | src/core/lib/security/transport/client_auth_filter.c | 2 | ||||
| -rw-r--r-- | src/core/lib/security/transport/server_auth_filter.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/core/lib/security/credentials/google_default/credentials_win32.c b/src/core/lib/security/credentials/google_default/credentials_windows.c index cd8b48080a..208b8fd9ad 100644 --- a/src/core/lib/security/credentials/google_default/credentials_win32.c +++ b/src/core/lib/security/credentials/google_default/credentials_windows.c @@ -33,7 +33,7 @@ #include <grpc/support/port_platform.h> -#ifdef GPR_WIN32 +#ifdef GPR_WINDOWS #include "src/core/lib/security/credentials/google_default/google_default_credentials.h" @@ -58,4 +58,4 @@ char *grpc_get_well_known_google_credentials_file_path_impl(void) { return result; } -#endif /* GPR_WIN32 */ +#endif /* GPR_WINDOWS */ diff --git a/src/core/lib/security/transport/client_auth_filter.c b/src/core/lib/security/transport/client_auth_filter.c index e3cbcb4433..27208ebb60 100644 --- a/src/core/lib/security/transport/client_auth_filter.c +++ b/src/core/lib/security/transport/client_auth_filter.c @@ -278,7 +278,7 @@ static void set_pollset(grpc_exec_ctx *exec_ctx, grpc_call_element *elem, /* Destructor for call_data */ static void destroy_call_elem(grpc_exec_ctx *exec_ctx, grpc_call_element *elem, - void *ignored) { + const grpc_call_stats *stats, void *ignored) { call_data *calld = elem->call_data; grpc_call_credentials_unref(calld->creds); if (calld->host != NULL) { diff --git a/src/core/lib/security/transport/server_auth_filter.c b/src/core/lib/security/transport/server_auth_filter.c index 34120aba42..8fca70c064 100644 --- a/src/core/lib/security/transport/server_auth_filter.c +++ b/src/core/lib/security/transport/server_auth_filter.c @@ -229,7 +229,7 @@ static void set_pollset(grpc_exec_ctx *exec_ctx, grpc_call_element *elem, /* Destructor for call_data */ static void destroy_call_elem(grpc_exec_ctx *exec_ctx, grpc_call_element *elem, - void *ignored) {} + const grpc_call_stats *stats, void *ignored) {} /* Constructor for channel_data */ static void init_channel_elem(grpc_exec_ctx *exec_ctx, |