diff options
| author |  Mark D. Roth <roth@google.com> | 2016-09-06 10:49:52 -0700 |
|---|---|---|
| committer | Mark D. Roth <roth@google.com> | 2016-09-06 10:49:52 -0700 |
| commit | e5f434913975f039b434d05852c6b7ab12774076 (patch) | |
| tree | 8dfea4d7175544be84705afeccf18e17a238623e /src/core/lib | |
| parent | b3a4f906af6823fef1c75bd1d37e5737a0ae98db (diff) | |
Fix portability problems.
Diffstat (limited to 'src/core/lib')
| -rw-r--r-- | src/core/lib/channel/deadline_filter.c | 2 | ||||
| -rw-r--r-- | src/core/lib/iomgr/error.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/core/lib/channel/deadline_filter.c b/src/core/lib/channel/deadline_filter.c index e4f132624f..2ca43e105b 100644 --- a/src/core/lib/channel/deadline_filter.c +++ b/src/core/lib/channel/deadline_filter.c @@ -197,7 +197,7 @@ typedef struct server_call_data { static grpc_error *init_call_elem(grpc_exec_ctx* exec_ctx, grpc_call_element* elem, grpc_call_element_args* args) { -gpr_log(GPR_INFO, "==> %s() -- call_data_size=%lu", __func__, elem->filter->sizeof_call_data); +gpr_log(GPR_INFO, "==> %s() -- call_data_size=%lu", __func__, (unsigned long)elem->filter->sizeof_call_data); base_call_data* calld = elem->call_data; // Note: size of call data is different between client and server. memset(calld, 0, elem->filter->sizeof_call_data); diff --git a/src/core/lib/iomgr/error.c b/src/core/lib/iomgr/error.c index e54154421a..17f19423a3 100644 --- a/src/core/lib/iomgr/error.c +++ b/src/core/lib/iomgr/error.c @@ -372,7 +372,7 @@ void grpc_error_get_status(grpc_error *error, grpc_status_code *code, // until we find the first one that has a status code. intptr_t status = GRPC_STATUS_UNKNOWN; // Default in case we don't find one. grpc_error* found_error = recursively_find_error_with_status(error, &status); - *code = status; + *code = (grpc_status_code)status; // Now populate msg. // If we found an error with a status code above, use that; otherwise, // fall back to using the parent error. |