aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/core/channel
diff options
context:
space:
mode:
authorGravatar Craig Tiller <craig.tiller@gmail.com>2015-05-30 11:08:34 -0700
committerGravatar Craig Tiller <craig.tiller@gmail.com>2015-05-30 11:08:34 -0700
commita2779c122ec3b2c3b6a475afa2ed18145d1f1b61 (patch)
tree4bb994c4e08e1c1ab30ad1841decbbf863e05548 /src/core/channel
parent8f17c6c0283aeb78b615580529e98f1a28bf3c77 (diff)
parentd7029e1ee3232fea606ab79b684e24294b7f8836 (diff)
Merge github.com:grpc/grpc into but-maybe-i-want-to-poll
Conflicts: Makefile
Diffstat (limited to 'src/core/channel')
-rw-r--r--src/core/channel/context.h7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/core/channel/context.h b/src/core/channel/context.h
index e2e5e80513..ac5796b9ef 100644
--- a/src/core/channel/context.h
+++ b/src/core/channel/context.h
@@ -41,4 +41,9 @@ typedef enum {
GRPC_CONTEXT_COUNT
} grpc_context_index;
-#endif
+typedef struct {
+ void *value;
+ void (*destroy)(void *);
+} grpc_call_context_element;
+
+#endif /* GRPC_INTERNAL_CORE_CHANNEL_CONTEXT_H */