diff options
| author |  Alistair Veitch <aveitch@google.com> | 2015-08-28 14:35:49 -0700 |
|---|---|---|
| committer | Alistair Veitch <aveitch@google.com> | 2015-08-28 14:35:49 -0700 |
| commit | bff9cf52ed6407862ce96ddfdcd8e97e56cdc520 (patch) | |
| tree | adcefb4d7740776b4e44a57336308c31dc0ef099 /src/core/census | |
| parent | 6afe53f2360a20a4d3abda60cfdde576c29b9857 (diff) | |
| parent | 808e5ae95f2fba44d2da925e8da0eaa5ce5c6585 (diff) | |
Merge branch 'master' into tracing_api
Diffstat (limited to 'src/core/census')
| -rw-r--r-- | src/core/census/grpc_filter.c | 2 | ||||
| -rw-r--r-- | src/core/census/grpc_filter.h | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/core/census/grpc_filter.c b/src/core/census/grpc_filter.c index fbedb35661..b78445595c 100644 --- a/src/core/census/grpc_filter.c +++ b/src/core/census/grpc_filter.c @@ -36,12 +36,12 @@ #include <stdio.h> #include <string.h> -#include "include/grpc/census.h" #include "src/core/census/rpc_stat_id.h" #include "src/core/channel/channel_stack.h" #include "src/core/channel/noop_filter.h" #include "src/core/statistics/census_interface.h" #include "src/core/statistics/census_rpc_stats.h" +#include <grpc/census.h> #include <grpc/support/alloc.h> #include <grpc/support/log.h> #include <grpc/support/slice.h> diff --git a/src/core/census/grpc_filter.h b/src/core/census/grpc_filter.h index 1453c05d28..b3de3adc94 100644 --- a/src/core/census/grpc_filter.h +++ b/src/core/census/grpc_filter.h @@ -31,8 +31,8 @@ * */ -#ifndef GRPC_INTERNAL_CORE_CHANNEL_CENSUS_FILTER_H -#define GRPC_INTERNAL_CORE_CHANNEL_CENSUS_FILTER_H +#ifndef GRPC_INTERNAL_CORE_CENSUS_GRPC_FILTER_H +#define GRPC_INTERNAL_CORE_CENSUS_GRPC_FILTER_H #include "src/core/channel/channel_stack.h" @@ -41,4 +41,4 @@ extern const grpc_channel_filter grpc_client_census_filter; extern const grpc_channel_filter grpc_server_census_filter; -#endif /* GRPC_INTERNAL_CORE_CHANNEL_CENSUS_FILTER_H */ +#endif /* GRPC_INTERNAL_CORE_CENSUS_GRPC_FILTER_H */ |