From: Rosen Penev <rosenp@gmail.com>
Date: Thu, 3 Feb 2022 22:42:26 +0000 (-0800)
Subject: remove compatibility code for older json-c versions
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=b7acc8e6fd5e13611ad90a593e98f9589af4009a;p=project%2Flibubox.git

remove compatibility code for older json-c versions

Avoid accidentally attempting to use the incompatible jsoncpp library

Signed-off-by: Rosen Penev <rosenp@gmail.com>
Signed-off-by: Felix Fietkau <nbd@nbd.name>
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b0fca61..f40eaa6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -15,11 +15,8 @@ OPTION(BUILD_LUA "build Lua plugin" ON)
 OPTION(BUILD_EXAMPLES "build examples" ON)
 
 INCLUDE(FindPkgConfig)
-PKG_SEARCH_MODULE(JSONC json-c)
-IF(JSONC_FOUND)
-  ADD_DEFINITIONS(-DJSONC)
-  INCLUDE_DIRECTORIES(${JSONC_INCLUDE_DIRS})
-ENDIF()
+PKG_SEARCH_MODULE(JSONC json-c REQUIRED)
+INCLUDE_DIRECTORIES(${JSONC_INCLUDE_DIRS})
 
 SET(SOURCES avl.c avl-cmp.c blob.c blobmsg.c uloop.c usock.c ustream.c ustream-fd.c vlist.c utils.c safe_list.c runqueue.c md5.c kvlist.c ulog.c base64.c udebug.c udebug-remote.c)
 
diff --git a/blobmsg_json.c b/blobmsg_json.c
index ec8b482..31eec09 100644
--- a/blobmsg_json.c
+++ b/blobmsg_json.c
@@ -17,11 +17,7 @@
 #include "blobmsg.h"
 #include "blobmsg_json.h"
 
-#ifdef JSONC
-	#include <json.h>
-#else
-	#include <json/json.h>
-#endif
+#include <json.h>
 
 bool blobmsg_add_object(struct blob_buf *b, json_object *obj)
 {
diff --git a/jshn.c b/jshn.c
index 1b685e5..9887bfe 100644
--- a/jshn.c
+++ b/jshn.c
@@ -13,12 +13,7 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
-#ifdef JSONC
-        #include <json.h>
-#else
-        #include <json/json.h>
-#endif
-
+#include <json.h>
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>