diff options
| author |  Vijay Pai <vpai@google.com> | 2016-03-28 11:09:21 -0700 |
|---|---|---|
| committer | Vijay Pai <vpai@google.com> | 2016-03-28 11:09:21 -0700 |
| commit | d0facacece41cb4ae887cb565d8d8447249d4adb (patch) | |
| tree | f90fa102c47dd9972f15258a1af3ae0e6e6c3e60 /test/core/end2end/fixtures/h2_uds.c | |
| parent | 761f7bc3e4cb87af5521eae8803d27dbee64c958 (diff) | |
| parent | e5cc05b5c6cee7026a0d28d39925621451506820 (diff) | |
Merge branch 'master' into make_unix_sockets_great_again
Diffstat (limited to 'test/core/end2end/fixtures/h2_uds.c')
| -rw-r--r-- | test/core/end2end/fixtures/h2_uds.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/test/core/end2end/fixtures/h2_uds.c b/test/core/end2end/fixtures/h2_uds.c index 30928270e5..1bdcdef8de 100644 --- a/test/core/end2end/fixtures/h2_uds.c +++ b/test/core/end2end/fixtures/h2_uds.c @@ -1,6 +1,6 @@ /* * - * Copyright 2015, Google Inc. + * Copyright 2015-2016, Google Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -37,13 +37,6 @@ #include <string.h> #include <unistd.h> -#include "src/core/channel/client_channel.h" -#include "src/core/channel/connected_channel.h" -#include "src/core/channel/http_server_filter.h" -#include "src/core/support/string.h" -#include "src/core/surface/channel.h" -#include "src/core/surface/server.h" -#include "src/core/transport/chttp2_transport.h" #include <grpc/support/alloc.h> #include <grpc/support/host_port.h> #include <grpc/support/log.h> @@ -51,6 +44,13 @@ #include <grpc/support/sync.h> #include <grpc/support/thd.h> #include <grpc/support/useful.h> +#include "src/core/lib/channel/client_channel.h" +#include "src/core/lib/channel/connected_channel.h" +#include "src/core/lib/channel/http_server_filter.h" +#include "src/core/lib/support/string.h" +#include "src/core/lib/surface/channel.h" +#include "src/core/lib/surface/server.h" +#include "src/core/lib/transport/chttp2_transport.h" #include "test/core/util/port.h" #include "test/core/util/test_config.h" |