blob: 72b50816f0cc495b39b6c7976951f2599b7ba788 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
|
--- a/blobmsg_json.c
+++ b/blobmsg_json.c
@@ -17,11 +17,7 @@
#include "blobmsg.h"
#include "blobmsg_json.h"
-#ifdef JSONC
- #include <json.h>
-#else
- #include <json/json.h>
-#endif
+#include <json-c/json.h>
bool blobmsg_add_object(struct blob_buf *b, json_object *obj)
{
--- a/jshn.c
+++ b/jshn.c
@@ -13,11 +13,8 @@
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#ifdef JSONC
- #include <json.h>
-#else
- #include <json/json.h>
-#endif
+
+#include <json-c/json.h>
#include <string.h>
#include <stdlib.h>
|