GOSTSec/sgminer
1
0
Fork 0
mirror of https://github.com/GOSTSec/sgminer synced 2025-01-30 08:24:26 +00:00
Code Issues Releases Wiki Activity

Merge pull request #112 from luke-jr/jansson_compat

Browse Source 
Restore compatibility with Jansson 1.3 and 2.0 (api.c required 2.1)
This commit is contained in:
Con Kolivas 2012-02-11 22:01:51 -08:00
commit 1885374802
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
api.c
View File

@ -1477,7 +1477,13 @@ void api(void)
param = NULL; param = NULL;
#if JANSSON_MAJOR_VERSION > 2 || (JANSSON_MAJOR_VERSION == 2 && JANSSON_MINOR_VERSION > 0)
json_config = json_loadb(buf, n, 0, &json_err); 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)) { if (!json_is_object(json_config)) {
strcpy(io_buffer, message(MSG_INVJSON, 0, NULL, isjson)); strcpy(io_buffer, message(MSG_INVJSON, 0, NULL, isjson));

4
cgminer.c
View File

@ -909,7 +909,11 @@ static char *load_config(const char *arg, void __maybe_unused *unused)
json_error_t err; json_error_t err;
json_t *config; json_t *config;
#if JANSSON_MAJOR_VERSION > 1
config = json_load_file(arg, 0, &err); config = json_load_file(arg, 0, &err);
#else
config = json_load_file(arg, &err);
#endif
if (!json_is_object(config)) if (!json_is_object(config))
return "JSON decode of file failed"; return "JSON decode of file failed";