diff options
| author |  Craig Tiller <craig.tiller@gmail.com> | 2015-04-22 07:56:09 -0700 |
|---|---|---|
| committer | Craig Tiller <craig.tiller@gmail.com> | 2015-04-22 07:56:09 -0700 |
| commit | 77979b08607a1e408fdbd8b0445dee3667742161 (patch) | |
| tree | 8508e9e4ec5b2887aee9c6e1c0d8ce48392a3262 /src/objective-c/GRPCClient/GRPCCall.m | |
| parent | 58ce3f0e37f5dc0f525fe7ec007f12f1fc91ebeb (diff) | |
| parent | 48b02ecc14dfd6c3ba1a90a90ba41df856c0786b (diff) | |
Merge branch 'batch-metadata' of github.com:ctiller/grpc into one-pass
Conflicts:
src/core/channel/http_client_filter.c
src/core/channel/http_server_filter.c
Diffstat (limited to 'src/objective-c/GRPCClient/GRPCCall.m')
| -rw-r--r-- | src/objective-c/GRPCClient/GRPCCall.m | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/objective-c/GRPCClient/GRPCCall.m b/src/objective-c/GRPCClient/GRPCCall.m index f246b81e63..989ce390e2 100644 --- a/src/objective-c/GRPCClient/GRPCCall.m +++ b/src/objective-c/GRPCClient/GRPCCall.m @@ -33,8 +33,8 @@ #import "GRPCCall.h" -#include <grpc.h> -#include <support/time.h> +#include <grpc/grpc.h> +#include <grpc/support/grpc_time.h> #import "GRPCMethodName.h" #import "private/GRPCChannel.h" |