X-Git-Url: http://git.archive.openwrt.org/?p=project%2Flibubox.git;a=blobdiff_plain;f=blobmsg_json.c;h=ffde23d33e15d11829bfea631aab3004f377751a;hp=8f208e0c5c62cc5544411d7b7aeb025ea2375152;hb=cbf80de7f4df61960f386cb01a899cf4228d38f3;hpb=411d10c845039e33ce4c8dfacaec0bb7af3fd6b5

diff --git a/blobmsg_json.c b/blobmsg_json.c
index 8f208e0..ffde23d 100644
--- a/blobmsg_json.c
+++ b/blobmsg_json.c
@@ -17,6 +17,12 @@
 #include "blobmsg.h"
 #include "blobmsg_json.h"
 
+#ifdef JSONC
+	#include <json.h>
+#else
+	#include <json/json.h>
+#endif
+
 bool blobmsg_add_object(struct blob_buf *b, json_object *obj)
 {
 	json_object_object_foreach(obj, key, val) {
@@ -76,7 +82,7 @@ static bool __blobmsg_add_json(struct blob_buf *b, json_object *obj)
 {
 	bool ret = false;
 
-	if (is_error(obj))
+	if (!obj)
 		return false;
 
 	if (json_object_get_type(obj) != json_type_object)