Merge libubox with the version 2016.02.26 from its git.

This commit is contained in:
2016-02-26 23:13:29 +01:00
parent 6d5f11268b
commit 737ecc15d0
39 changed files with 2971 additions and 486 deletions

View File

@@ -16,17 +16,13 @@
#ifndef __BLOBMSG_JSON_H
#define __BLOBMSG_JSON_H
#ifdef JSONC
#include <json.h>
#else
#include <json/json.h>
#endif
struct json_object;
#include <stdbool.h>
#include "blobmsg.h"
bool blobmsg_add_object(struct blob_buf *b, json_object *obj);
bool blobmsg_add_json_element(struct blob_buf *b, const char *name, json_object *obj);
bool blobmsg_add_object(struct blob_buf *b, struct json_object *obj);
bool blobmsg_add_json_element(struct blob_buf *b, const char *name, struct json_object *obj);
bool blobmsg_add_json_from_string(struct blob_buf *b, const char *str);
bool blobmsg_add_json_from_file(struct blob_buf *b, const char *file);