From 7d716668d62817993d864a89ba2cf51fdd81eb49 Mon Sep 17 00:00:00 2001
From: Daniel Verkamp <daniel.verkamp@intel.com>
Date: Wed, 31 Jan 2018 11:14:12 -0700
Subject: [PATCH] utf.h: remove #include "spdk/json.h"

After the renaming of json_internal.h to utf.h, it doesn't make sense
for utf.h to include spdk/json.h.

Move the #include "spdk/json.h" to the JSON library implementation
files and remove it from utf.h.

Change-Id: I36092524c9b982fd2e931faf1b7c5d1d6a6c80c0
Signed-off-by: Daniel Verkamp <daniel.verkamp@intel.com>
Reviewed-on: https://review.gerrithub.io/397603
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Seth Howell <seth.howell5141@gmail.com>
Reviewed-by: <shuhei.matsumoto.xt@hitachi.com>
---
 include/spdk_internal/utf.h | 1 -
 lib/json/json_parse.c       | 2 ++
 lib/json/json_util.c        | 2 ++
 lib/json/json_write.c       | 2 ++
 4 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/include/spdk_internal/utf.h b/include/spdk_internal/utf.h
index 9f5a680cc..b2b1c3c45 100644
--- a/include/spdk_internal/utf.h
+++ b/include/spdk_internal/utf.h
@@ -37,7 +37,6 @@
 #include "spdk/stdinc.h"
 
 #include "spdk/endian.h"
-#include "spdk/json.h"
 #include "spdk/likely.h"
 #include "spdk/string.h"
 
diff --git a/lib/json/json_parse.c b/lib/json/json_parse.c
index ed8e4a368..8639d5ff8 100644
--- a/lib/json/json_parse.c
+++ b/lib/json/json_parse.c
@@ -31,6 +31,8 @@
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "spdk/json.h"
+
 #include "spdk_internal/utf.h"
 
 #define SPDK_JSON_MAX_NESTING_DEPTH	64
diff --git a/lib/json/json_util.c b/lib/json/json_util.c
index cb9a90140..5acc2e1ed 100644
--- a/lib/json/json_util.c
+++ b/lib/json/json_util.c
@@ -31,6 +31,8 @@
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "spdk/json.h"
+
 #include "spdk_internal/utf.h"
 
 size_t
diff --git a/lib/json/json_write.c b/lib/json/json_write.c
index 155463b77..fa7074876 100644
--- a/lib/json/json_write.c
+++ b/lib/json/json_write.c
@@ -31,6 +31,8 @@
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "spdk/json.h"
+
 #include "spdk_internal/utf.h"
 
 struct spdk_json_write_ctx {