Fix portability problems.

pull/7970/head
Mark D. Roth 9 years ago
parent b3a4f906af
commit e5f4349139
  1. 2
      src/core/lib/channel/deadline_filter.c
  2. 2
      src/core/lib/iomgr/error.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);

@ -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.

Loading…
Cancel
Save