aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2018-03-23 11:36:19 +0000
committerWerner Koch <[email protected]>2018-03-23 11:36:19 +0000
commiteee68c1b13fbe21c123f469712817e0c81f16383 (patch)
treeadd070b7a23f0ae9aadd67b2dd29a72a1a1d636b
parentMerge branch 'json-tool' (diff)
downloadgpgme-eee68c1b13fbe21c123f469712817e0c81f16383.tar.gz
gpgme-eee68c1b13fbe21c123f469712817e0c81f16383.zip
build: Allow building with released libgpg-error.
* src/gpgme-json.c (add_base64_to_object): Return an error if building with an older libgpg-error. Signed-off-by: Werner Koch <[email protected]>
-rw-r--r--src/gpgme-json.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/gpgme-json.c b/src/gpgme-json.c
index 6ba79e5a..09b34bbb 100644
--- a/src/gpgme-json.c
+++ b/src/gpgme-json.c
@@ -147,6 +147,9 @@ xjson_AddBoolToObject (cjson_t object, const char *name, int abool)
static gpg_error_t
add_base64_to_object (cjson_t object, const char *name, gpgme_data_t data)
{
+#if GPGRT_VERSION_NUMBER < 0x011d00 /* 1.29 */
+ return gpg_error (GPG_ERR_NOT_SUPPORTED);
+#else
gpg_err_code_t err;
estream_t fp = NULL;
gpgrt_b64state_t state = NULL;
@@ -220,6 +223,7 @@ add_base64_to_object (cjson_t object, const char *name, gpgme_data_t data)
es_fclose (fp);
gpgme_data_release (data);
return err;
+#endif
}