fixes for json 0.12

Signed-off-by: John Crispin <blogic@openwrt.org>

diff --git a/ubus.c b/ubus.c
index 4fa03192d42075b5dda54a01d7812b9e7b888dc8..f7d1f11a15037839ff1c46656ad11a37985cb623 100644 (file)
--- a/ubus.c
+++ b/ubus.c
@@ -192,16 +192,16 @@ static void uh_ubus_send_response(struct client *cl)
 static void uh_ubus_init_response(struct client *cl)
 {
        struct dispatch_ubus *du = &cl->dispatch.ubus;
-       struct json_object *obj = du->jsobj_cur;
+       struct json_object *obj = du->jsobj_cur, *obj2 = NULL;
 
        blob_buf_init(&buf, 0);
        blobmsg_add_string(&buf, "jsonrpc", "2.0");
 
        if (obj)
-               obj = json_object_object_get(obj, "id");
+               json_object_object_get_ex(obj, "id", &obj2);
 
-       if (obj)
-               blobmsg_add_json_element(&buf, "id", obj);
+       if (obj2)
+               blobmsg_add_json_element(&buf, "id", obj2);
        else
                blobmsg_add_field(&buf, BLOBMSG_TYPE_UNSPEC, "id", NULL, 0);
 }

diff --git a/uhttpd.h b/uhttpd.h
index 9bf8cbb63250d759d024f4a641b3cbfb7caced67..1c82d76cd3f98a9c00f97be50b1817da4d035848 100644 (file)
--- a/uhttpd.h
+++ b/uhttpd.h
@@ -31,7 +31,7 @@
 #include <libubox/utils.h>
 #ifdef HAVE_UBUS
 #include <libubus.h>
-#include <json/json.h>
+#include <json-c/json.h>
 #endif
 #ifdef HAVE_TLS
 #include <libubox/ustream-ssl.h>