From 33f1e0b0926e973fb5ae445e9a995848762143bb Mon Sep 17 00:00:00 2001
From: Jo-Philipp Wich <jo@mein.io>
Date: Thu, 7 Apr 2022 22:10:41 +0200
Subject: treewide: move json-c compat shims into internal header file

Do not expose the json-c compat functions in ucode's public headers to
avoid clashes when building on systems with modern json-c.

Also remove some explicit json-c/json-c.h includes in places where it is
not needed.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
---
 include/ucode/compiler.h |  1 -
 include/ucode/util.h     | 26 --------------------------
 include/ucode/vallist.h  |  1 -
 3 files changed, 28 deletions(-)

(limited to 'include')

diff --git a/include/ucode/compiler.h b/include/ucode/compiler.h
index a85b48b..15b77b3 100644
--- a/include/ucode/compiler.h
+++ b/include/ucode/compiler.h
@@ -20,7 +20,6 @@
 #include <stddef.h>
 #include <stdint.h>
 #include <stdbool.h>
-#include <json-c/json.h>
 
 #include "source.h"
 #include "lexer.h"
diff --git a/include/ucode/util.h b/include/ucode/util.h
index 35c1e56..3203499 100644
--- a/include/ucode/util.h
+++ b/include/ucode/util.h
@@ -159,30 +159,4 @@ static inline struct printbuf *xprintbuf_new(void) {
 	return pb;
 }
 
-
-/* json-c compat */
-
-#ifndef HAVE_PARSE_END
-static inline size_t json_tokener_get_parse_end(struct json_tokener *tok) {
-	return (size_t)tok->char_offset;
-}
-#endif
-
-#ifndef HAVE_ARRAY_EXT
-static inline struct json_object *json_object_new_array_ext(int size) {
-	(void) size;
-	return json_object_new_array();
-}
-#endif
-
-#ifndef HAVE_JSON_UINT64
-static inline struct json_object *json_object_new_uint64(uint64_t i) {
-	return json_object_new_int64((int64_t)i);
-}
-
-static inline uint64_t json_object_get_uint64(const struct json_object *obj) {
-	return (uint64_t)json_object_get_int64(obj);
-}
-#endif
-
 #endif /* UCODE_UTIL_H */
diff --git a/include/ucode/vallist.h b/include/ucode/vallist.h
index 53750bd..fb46677 100644
--- a/include/ucode/vallist.h
+++ b/include/ucode/vallist.h
@@ -21,7 +21,6 @@
 #include <stddef.h>
 #include <stdbool.h>
 #include <stdio.h>
-#include <json-c/json.h>
 
 #include "types.h"
 
-- 
cgit v1.2.3