diff options
| author |  Craig Tiller <ctiller@google.com> | 2016-03-28 13:10:02 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2016-03-28 13:10:02 -0700 |
| commit | fdec85fc5af8ef5c4b8a9d28a1a61877ddbb0e22 (patch) | |
| tree | 4512c42b3fe832f07a80dd63a27242316055d69f /test/core/json | |
| parent | 92b3f568dbd1bf15c85cddac8d8f57a5a58201ef (diff) | |
| parent | e5cc05b5c6cee7026a0d28d39925621451506820 (diff) | |
Merge github.com:grpc/grpc into fuzzy-bits
Diffstat (limited to 'test/core/json')
| -rw-r--r-- | test/core/json/json_rewrite.c | 6 | ||||
| -rw-r--r-- | test/core/json/json_rewrite_test.c | 4 | ||||
| -rw-r--r-- | test/core/json/json_stream_error_test.c | 4 | ||||
| -rw-r--r-- | test/core/json/json_test.c | 4 |
4 files changed, 9 insertions, 9 deletions
diff --git a/test/core/json/json_rewrite.c b/test/core/json/json_rewrite.c index 0c615a9975..41090db105 100644 --- a/test/core/json/json_rewrite.c +++ b/test/core/json/json_rewrite.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 @@ -38,8 +38,8 @@ #include <grpc/support/cmdline.h> #include <grpc/support/log.h> -#include "src/core/json/json_reader.h" -#include "src/core/json/json_writer.h" +#include "src/core/lib/json/json_reader.h" +#include "src/core/lib/json/json_writer.h" typedef struct json_writer_userdata { FILE *out; } json_writer_userdata; diff --git a/test/core/json/json_rewrite_test.c b/test/core/json/json_rewrite_test.c index 1916d4b86c..33fc98ed74 100644 --- a/test/core/json/json_rewrite_test.c +++ b/test/core/json/json_rewrite_test.c @@ -39,8 +39,8 @@ #include <grpc/support/useful.h> #include "test/core/util/test_config.h" -#include "src/core/json/json_reader.h" -#include "src/core/json/json_writer.h" +#include "src/core/lib/json/json_reader.h" +#include "src/core/lib/json/json_writer.h" typedef struct json_writer_userdata { FILE *cmp; } json_writer_userdata; diff --git a/test/core/json/json_stream_error_test.c b/test/core/json/json_stream_error_test.c index 3b07fcd38e..630e1b03df 100644 --- a/test/core/json/json_stream_error_test.c +++ b/test/core/json/json_stream_error_test.c @@ -39,8 +39,8 @@ #include <grpc/support/useful.h> #include "test/core/util/test_config.h" -#include "src/core/json/json_reader.h" -#include "src/core/json/json_writer.h" +#include "src/core/lib/json/json_reader.h" +#include "src/core/lib/json/json_writer.h" static int g_string_clear_once = 0; diff --git a/test/core/json/json_test.c b/test/core/json/json_test.c index db3119af70..13ee5bbe45 100644 --- a/test/core/json/json_test.c +++ b/test/core/json/json_test.c @@ -37,8 +37,8 @@ #include <grpc/support/log.h> #include <grpc/support/string_util.h> #include <grpc/support/useful.h> -#include "src/core/json/json.h" -#include "src/core/support/string.h" +#include "src/core/lib/json/json.h" +#include "src/core/lib/support/string.h" #include "test/core/util/test_config.h" |