diff options
| author |  Craig Tiller <craig.tiller@gmail.com> | 2015-12-04 06:50:38 -0800 |
|---|---|---|
| committer | Craig Tiller <craig.tiller@gmail.com> | 2015-12-04 06:50:38 -0800 |
| commit | 2c23ad57ed62aa2158ed0e8ff9d1910ab79e647b (patch) | |
| tree | 09fd84e6884dacae5b03aa5ee91943398e98f19b /src/core/channel | |
| parent | a17bb2856bacae4231fdb4a7c8d87e31d680f0bd (diff) | |
| parent | c9614d30031c1ed2d6fbcc292d9428c1cc88a517 (diff) | |
Merge github.com:grpc/grpc into connected-subchannel
Diffstat (limited to 'src/core/channel')
| -rw-r--r-- | src/core/channel/compress_filter.c | 4 | ||||
| -rw-r--r-- | src/core/channel/http_client_filter.c | 4 | ||||
| -rw-r--r-- | src/core/channel/http_server_filter.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/core/channel/compress_filter.c b/src/core/channel/compress_filter.c index c997a074a7..cc8e191628 100644 --- a/src/core/channel/compress_filter.c +++ b/src/core/channel/compress_filter.c @@ -39,11 +39,11 @@ #include <grpc/support/log.h> #include <grpc/support/slice_buffer.h> -#include "src/core/channel/compress_filter.h" #include "src/core/channel/channel_args.h" -#include "src/core/profiling/timers.h" +#include "src/core/channel/compress_filter.h" #include "src/core/compression/algorithm_metadata.h" #include "src/core/compression/message_compress.h" +#include "src/core/profiling/timers.h" #include "src/core/support/string.h" #include "src/core/transport/static_metadata.h" diff --git a/src/core/channel/http_client_filter.c b/src/core/channel/http_client_filter.c index b9a30cdaf2..65cfb778bb 100644 --- a/src/core/channel/http_client_filter.c +++ b/src/core/channel/http_client_filter.c @@ -31,12 +31,12 @@ */ #include "src/core/channel/http_client_filter.h" -#include <string.h> #include <grpc/support/alloc.h> #include <grpc/support/log.h> #include <grpc/support/string_util.h> -#include "src/core/support/string.h" +#include <string.h> #include "src/core/profiling/timers.h" +#include "src/core/support/string.h" #include "src/core/transport/static_metadata.h" typedef struct call_data { diff --git a/src/core/channel/http_server_filter.c b/src/core/channel/http_server_filter.c index e7b8e42819..647621cc4f 100644 --- a/src/core/channel/http_server_filter.c +++ b/src/core/channel/http_server_filter.c @@ -33,9 +33,9 @@ #include "src/core/channel/http_server_filter.h" -#include <string.h> #include <grpc/support/alloc.h> #include <grpc/support/log.h> +#include <string.h> #include "src/core/profiling/timers.h" #include "src/core/transport/static_metadata.h" |