remove compatibility code for older json-c versions

Avoid accidentally attempting to use the incompatible jsoncpp library

Signed-off-by: Rosen Penev <[email protected]>
Signed-off-by: Felix Fietkau <[email protected]>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b0fca612537e43ab3b9fe4c01ea441b53fa4447f..f40eaa67285164965d53057b092070e343bdb5d9 100644 (file)
--- 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 ec8b482c30c96a355aca58651632bc509a16bedf..31eec099998a4d481f97fb9edd4c704305888a07 100644 (file)
--- 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 1b685e5fb0d853c4053389242b92c34967beb94f..9887bfefa3a7e64b33206997fbb2dcb1ed8772c4 100644 (file)
--- 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>