diff options
| author |  yang-g <yangg@google.com> | 2016-02-08 15:00:32 -0800 |
|---|---|---|
| committer | yang-g <yangg@google.com> | 2016-02-08 15:00:32 -0800 |
| commit | a1fc8fb95fd37e479b806cbe0f376e1f341141c5 (patch) | |
| tree | 8a3dd8c84d49862b4937256255d73812ce50223e /include | |
| parent | e2a4e99091b477d7ccf83214e368df2fe9439c66 (diff) | |
| parent | 757c157d861dff34bb85b4f6e10d0708fecb88ce (diff) | |
Merge remote-tracking branch 'upstream/master' into inherit_from_grpc_library
Diffstat (limited to 'include')
| -rw-r--r-- | include/grpc/impl/codegen/compression_types.h | 2 | ||||
| -rw-r--r-- | include/grpc/impl/codegen/propagation_bits.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/grpc/impl/codegen/compression_types.h b/include/grpc/impl/codegen/compression_types.h index 94a10da21b..0daccd92f2 100644 --- a/include/grpc/impl/codegen/compression_types.h +++ b/include/grpc/impl/codegen/compression_types.h @@ -34,7 +34,7 @@ #ifndef GRPC_IMPL_CODEGEN_COMPRESSION_TYPES_H #define GRPC_IMPL_CODEGEN_COMPRESSION_TYPES_H -#include <grpc/support/port_platform.h> +#include <grpc/impl/codegen/port_platform.h> #ifdef __cplusplus extern "C" { diff --git a/include/grpc/impl/codegen/propagation_bits.h b/include/grpc/impl/codegen/propagation_bits.h index d036415599..cdd699710c 100644 --- a/include/grpc/impl/codegen/propagation_bits.h +++ b/include/grpc/impl/codegen/propagation_bits.h @@ -34,7 +34,7 @@ #ifndef GRPC_IMPL_CODEGEN_H #define GRPC_IMPL_CODEGEN_H -#include <grpc/support/port_platform.h> +#include <grpc/impl/codegen/port_platform.h> #ifdef __cplusplus extern "C" { |