From fdadb0b5493ea9a8ba25f6dc14dd06697e641f24 Mon Sep 17 00:00:00 2001 From: Luke Dashjr Date: Sat, 11 Feb 2012 15:46:08 -0500 Subject: [PATCH] Restore compatibility with Jansson 1.3 and 2.0 (api.c required 2.1) --- api.c | 6 ++++++ cgminer.c | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/api.c b/api.c index ac34ff41..82e942b2 100644 --- a/api.c +++ b/api.c @@ -1476,7 +1476,13 @@ void api(void) param = NULL; +#if JANSSON_MAJOR_VERSION > 2 || (JANSSON_MAJOR_VERSION == 2 && JANSSON_MINOR_VERSION > 0) json_config = json_loadb(buf, n, 0, &json_err); +#elif JANSSON_MAJOR_VERSION > 1 + json_config = json_loads(buf, 0, &json_err); +#else + json_config = json_loads(buf, &json_err); +#endif if (!json_is_object(json_config)) { strcpy(io_buffer, message(MSG_INVJSON, 0, NULL, isjson)); diff --git a/cgminer.c b/cgminer.c index 92754595..9cc7daaa 100644 --- a/cgminer.c +++ b/cgminer.c @@ -914,7 +914,11 @@ static char *load_config(const char *arg, void __maybe_unused *unused) json_error_t err; json_t *config; +#if JANSSON_MAJOR_VERSION > 1 config = json_load_file(arg, 0, &err); +#else + config = json_load_file(arg, &err); +#endif if (!json_is_object(config)) return "JSON decode of file failed";