diff options
| author |  ncteisen <ncteisen@gmail.com> | 2018-03-01 19:57:24 -0800 |
|---|---|---|
| committer | ncteisen <ncteisen@gmail.com> | 2018-03-01 19:57:24 -0800 |
| commit | 75cf85c9cea06899e2b633b16abbe40cbb9ca3c2 (patch) | |
| tree | c67c06024bd2bbd7147f77b882576367f98ebe35 /src/core/lib/json | |
| parent | ac86f043735ea75a5ad79283ef50042d7448f04f (diff) | |
| parent | c372f19bf4935c08665ffda929b831a98dea99c4 (diff) | |
Merge branch 'master' of https://github.com/grpc/grpc into channel-tracing
Diffstat (limited to 'src/core/lib/json')
| -rw-r--r-- | src/core/lib/json/json.cc | 2 | ||||
| -rw-r--r-- | src/core/lib/json/json.h | 3 | ||||
| -rw-r--r-- | src/core/lib/json/json_reader.cc | 4 | ||||
| -rw-r--r-- | src/core/lib/json/json_reader.h | 1 | ||||
| -rw-r--r-- | src/core/lib/json/json_string.cc | 2 | ||||
| -rw-r--r-- | src/core/lib/json/json_writer.cc | 4 | ||||
| -rw-r--r-- | src/core/lib/json/json_writer.h | 2 |
7 files changed, 14 insertions, 4 deletions
diff --git a/src/core/lib/json/json.cc b/src/core/lib/json/json.cc index 2633231224..816241bbf0 100644 --- a/src/core/lib/json/json.cc +++ b/src/core/lib/json/json.cc @@ -16,6 +16,8 @@ * */ +#include <grpc/support/port_platform.h> + #include <string.h> #include <grpc/support/alloc.h> diff --git a/src/core/lib/json/json.h b/src/core/lib/json/json.h index d88a79271f..c8a87a7b87 100644 --- a/src/core/lib/json/json.h +++ b/src/core/lib/json/json.h @@ -19,6 +19,9 @@ #ifndef GRPC_CORE_LIB_JSON_JSON_H #define GRPC_CORE_LIB_JSON_JSON_H + +#include <grpc/support/port_platform.h> + #include <stdbool.h> #include <stdlib.h> diff --git a/src/core/lib/json/json_reader.cc b/src/core/lib/json/json_reader.cc index 6dadea5006..819572e4de 100644 --- a/src/core/lib/json/json_reader.cc +++ b/src/core/lib/json/json_reader.cc @@ -16,10 +16,10 @@ * */ -#include <string.h> - #include <grpc/support/port_platform.h> +#include <string.h> + #include <grpc/support/log.h> #include "src/core/lib/json/json_reader.h" diff --git a/src/core/lib/json/json_reader.h b/src/core/lib/json/json_reader.h index 03185cb2b6..78f7ad9f3a 100644 --- a/src/core/lib/json/json_reader.h +++ b/src/core/lib/json/json_reader.h @@ -20,6 +20,7 @@ #define GRPC_CORE_LIB_JSON_JSON_READER_H #include <grpc/support/port_platform.h> + #include "src/core/lib/json/json_common.h" typedef enum { diff --git a/src/core/lib/json/json_string.cc b/src/core/lib/json/json_string.cc index 8200900956..4f9175b9e7 100644 --- a/src/core/lib/json/json_string.cc +++ b/src/core/lib/json/json_string.cc @@ -16,6 +16,8 @@ * */ +#include <grpc/support/port_platform.h> + #include <stdlib.h> #include <string.h> diff --git a/src/core/lib/json/json_writer.cc b/src/core/lib/json/json_writer.cc index 6d442b8716..7bbdccc7a3 100644 --- a/src/core/lib/json/json_writer.cc +++ b/src/core/lib/json/json_writer.cc @@ -16,10 +16,10 @@ * */ -#include <string.h> - #include <grpc/support/port_platform.h> +#include <string.h> + #include "src/core/lib/json/json_writer.h" static void json_writer_output_char(grpc_json_writer* writer, char c) { diff --git a/src/core/lib/json/json_writer.h b/src/core/lib/json/json_writer.h index a4f2d4daeb..ba0bedde7f 100644 --- a/src/core/lib/json/json_writer.h +++ b/src/core/lib/json/json_writer.h @@ -31,6 +31,8 @@ #ifndef GRPC_CORE_LIB_JSON_JSON_WRITER_H #define GRPC_CORE_LIB_JSON_JSON_WRITER_H +#include <grpc/support/port_platform.h> + #include <stdlib.h> #include "src/core/lib/json/json_common.h" |