diff options
author | Werner Koch <[email protected]> | 2016-07-14 13:58:56 +0000 |
---|---|---|
committer | Werner Koch <[email protected]> | 2016-07-14 13:58:56 +0000 |
commit | be1e4560d5afb99a6a7b7c639cce980006530a9e (patch) | |
tree | 0ba98e2dbc56153cb5f6e1c50b2adc259965a40e /common/util.h | |
parent | Merge branch 'master' into STABLE-BRANCH-2-2 (diff) | |
parent | po: Auto-update translations (diff) | |
download | gnupg-be1e4560d5afb99a6a7b7c639cce980006530a9e.tar.gz gnupg-be1e4560d5afb99a6a7b7c639cce980006530a9e.zip |
Merge branch 'master' into STABLE-BRANCH-2-2
Diffstat (limited to '')
-rw-r--r-- | common/util.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/common/util.h b/common/util.h index c84847ad7..eb7a3fd31 100644 --- a/common/util.h +++ b/common/util.h @@ -36,11 +36,10 @@ #include <gpg-error.h> /* We need gpg_error_t and estream. */ /* These error codes are used but not defined in the required - libgpg-error version. Define them here. */ -/* Example: (#if GPG_ERROR_VERSION_NUMBER < 0x011500 // 1.21) */ -#if GPG_ERROR_VERSION_NUMBER < 0x011600 /* 1.22 */ -# define GPG_ERR_DB_CORRUPTED 218 -#endif /* gpg_error < 1.22 */ + * libgpg-error version. Define them here. + * Example: (#if GPG_ERROR_VERSION_NUMBER < 0x011500 // 1.21) + */ + /* Hash function used with libksba. */ #define HASH_FNC ((void (*)(void *, const void*,size_t))gcry_md_write) |