From 6a3b05e6504e1438e598156531a6ea58e20c0c4a Mon Sep 17 00:00:00 2001 From: Jeff Garzik Date: Mon, 9 May 2011 22:10:16 -0400 Subject: jansson 2.x compatibility --- util.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/util.c b/util.c index 72a086a..b6c3c60 100644 --- a/util.c +++ b/util.c @@ -22,6 +22,12 @@ #include "miner.h" #include "elist.h" +#if JANSSON_MAJOR_VERSION >= 2 +#define JSON_LOADS(str, err_ptr) json_loads((str), 0, (err_ptr)) +#else +#define JSON_LOADS(str, err_ptr) json_loads((str), (err_ptr)) +#endif + struct data_buffer { void *buf; size_t len; @@ -269,7 +275,7 @@ json_t *json_rpc_call(CURL *curl, const char *url, free(hi.lp_path); hi.lp_path = NULL; - val = json_loads(all_data.buf, &err); + val = JSON_LOADS(all_data.buf, &err); if (!val) { applog(LOG_ERR, "JSON decode failed(%d): %s", err.line, err.text); goto err_out; -- cgit v1.2.3-18-g5258