diff options
| author | Andreas Grapentin <andreas@grapentin.org> | 2019-02-18 00:56:53 +0100 |
|---|---|---|
| committer | Andreas Grapentin <andreas@grapentin.org> | 2019-02-18 00:56:53 +0100 |
| commit | 74b59d099ec842dd6ea87713c223ae5c9572a357 (patch) | |
| tree | 452bdf7f366637966f01dbbd4e990d69a371ff92 /nonprism/bti/0001-Replace-removed-is_error-macro.patch | |
| parent | 571cd6d709c3e09f4fe5d49d1e8c9d283d980c05 (diff) | |
| download | abslibre-74b59d099ec842dd6ea87713c223ae5c9572a357.tar.gz abslibre-74b59d099ec842dd6ea87713c223ae5c9572a357.tar.bz2 abslibre-74b59d099ec842dd6ea87713c223ae5c9572a357.zip | |
nonprism/bti: rebuilt
Diffstat (limited to 'nonprism/bti/0001-Replace-removed-is_error-macro.patch')
| -rw-r--r-- | nonprism/bti/0001-Replace-removed-is_error-macro.patch | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/nonprism/bti/0001-Replace-removed-is_error-macro.patch b/nonprism/bti/0001-Replace-removed-is_error-macro.patch new file mode 100644 index 000000000..d42286ccc --- /dev/null +++ b/nonprism/bti/0001-Replace-removed-is_error-macro.patch @@ -0,0 +1,45 @@ +From 0db8dc6022f67a4e1f49397b8bf519b2a34f74c9 Mon Sep 17 00:00:00 2001 +From: Jelle van der Waa <jelle@vdwaa.nl> +Date: Wed, 27 Dec 2017 11:05:45 +0100 +Subject: [PATCH] Replace removed is_error macro + +The json-c library removed the is_error macro in 0.13, replaced the +macro calls with a != NULL statement. +--- + bti.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/bti.c b/bti.c +index 7f485a8..9b68e17 100644 +--- a/bti.c ++++ b/bti.c +@@ -451,7 +451,7 @@ static void parse_timeline(char *document, struct session *session) + struct json_object *val; \ + struct lh_entry *entry; \ + for (entry = json_object_get_object(obj)->head; \ +- ({ if(entry && !is_error(entry)) { \ ++ ({ if(entry && entry != NULL) { \ + key = (char*)entry->k; \ + val = (struct json_object*)entry->v; \ + } ; entry; }); \ +@@ -667,7 +667,7 @@ static int parse_response_json(char *document, struct session *session) + + /* make global for now */ + store_session = session; +- if (!is_error(jobj)) { ++ if (jobj != NULL) { + /* guards against a json pre 0.10 bug */ + json_parse(jobj,0); + } +@@ -692,7 +692,7 @@ static void parse_timeline_json(char *document, struct session *session) + + /* make global for now */ + store_session = session; +- if (!is_error(jobj)) { ++ if (jobj != NULL) { + /* guards against a json pre 0.10 bug */ + if (json_object_get_type(jobj)==json_type_array) { + json_parse_array(jobj, NULL, 0); +-- +2.15.1 + |