aboutsummaryrefslogtreecommitdiffhomepage
path: root/include
diff options
context:
space:
mode:
authorGravatar Craig Tiller <ctiller@google.com>2015-08-06 09:38:21 -0700
committerGravatar Craig Tiller <ctiller@google.com>2015-08-06 09:38:21 -0700
commit44912d78a00d3614b94291d60fcbe75109542722 (patch)
tree00020c7f27c02c5b2839f9df2a831a700a2347c1 /include
parent354e2127a2fd5003449fb3d6456bd28818d0ac9b (diff)
Explicitly spell out cancellation in default propagation mask
Diffstat (limited to 'include')
-rw-r--r--include/grpc/grpc.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/include/grpc/grpc.h b/include/grpc/grpc.h
index 003e1d7c9a..bf340e81ca 100644
--- a/include/grpc/grpc.h
+++ b/include/grpc/grpc.h
@@ -368,10 +368,10 @@ typedef struct grpc_op {
GRPC_PROPAGATE_DEFAULTS & ~GRPC_PROPAGATE_DEADLINE to disable deadline
propagation. Doing so gives flexibility in the future to define new
propagation types that are default inherited or not. */
-#define GRPC_PROPAGATE_DEFAULTS \
- ((gpr_uint32)((0xffff | GRPC_PROPAGATE_DEADLINE | \
- GRPC_PROPAGATE_CENSUS_STATS_CONTEXT | \
- GRPC_PROPAGATE_CENSUS_TRACING_CONTEXT)))
+#define GRPC_PROPAGATE_DEFAULTS \
+ ((gpr_uint32)(( \
+ 0xffff | GRPC_PROPAGATE_DEADLINE | GRPC_PROPAGATE_CENSUS_STATS_CONTEXT | \
+ GRPC_PROPAGATE_CENSUS_TRACING_CONTEXT | GRPC_PROPAGATE_CANCELLATION)))
/** Initialize the grpc library.