Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.openwrt.org/project/libubox.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2014-10-24 15:40:10 +0400
committerFelix Fietkau <nbd@openwrt.org>2014-10-24 15:40:14 +0400
commitd133da5562b36d5ac871cbe927bb9ecdf0569a51 (patch)
treee8dfd80f5984b65353545f3ee4b7f469df29aed1 /blobmsg_json.h
parent464e05e33b4c086be0bd932760a41ddcf9373187 (diff)
blobmsg_json: avoid redefinition of json_object
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Diffstat (limited to 'blobmsg_json.h')
-rw-r--r--blobmsg_json.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/blobmsg_json.h b/blobmsg_json.h
index 5ea6f09..cd9ed33 100644
--- a/blobmsg_json.h
+++ b/blobmsg_json.h
@@ -17,13 +17,12 @@
#define __BLOBMSG_JSON_H
struct json_object;
-typedef struct json_object 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);