Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

jansson 2.x compatibility

  • Loading branch information...
commit 6a3b05e6504e1438e598156531a6ea58e20c0c4a 1 parent 7ff1280
Jeff Garzik authored Jeff Garzik committed
Showing with 7 additions and 1 deletion.
  1. +7 −1 util.c
View
8 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;
Please sign in to comment.
Something went wrong with that request. Please try again.