From d133da5562b36d5ac871cbe927bb9ecdf0569a51 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Fri, 24 Oct 2014 13:40:10 +0200 Subject: [PATCH] blobmsg_json: avoid redefinition of json_object Signed-off-by: Felix Fietkau --- blobmsg_json.h | 5 ++--- 1 file 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 #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); -- 2.11.0