diff options
| author | Werner Koch <[email protected]> | 2020-11-09 11:10:48 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2020-11-09 11:10:48 +0000 |
| commit | fc01ae50718b4030fbfdf3ca65ddb3e3107eacda (patch) | |
| tree | d0b0b225e5da44ef84116068e33944113f966843 | |
| parent | Require Libgcrypt 1.8 (diff) | |
| download | gnupg-fc01ae50718b4030fbfdf3ca65ddb3e3107eacda.tar.gz gnupg-fc01ae50718b4030fbfdf3ca65ddb3e3107eacda.zip | |
Require Libgpg-error 1.27
* configure.ac (NEED_GPG_ERROR_VERSION): Require 1.27
* common/util.h: Remove compatibility macros.
--
This is just a minor change to align with the need for Libgcrypt 1.8.
The latter was first released in summer 2017 while Libgpg-error 1.27
was released earlier in spring that year.
Signed-off-by: Werner Koch <[email protected]>
| -rw-r--r-- | common/util.h | 20 | ||||
| -rw-r--r-- | configure.ac | 2 |
2 files changed, 1 insertions, 21 deletions
diff --git a/common/util.h b/common/util.h index 70a0f4f56..4d61bc0ea 100644 --- a/common/util.h +++ b/common/util.h @@ -44,26 +44,6 @@ # define GPG_ERR_BAD_AUTH 315 #endif -#if GPG_ERROR_VERSION_NUMBER < 0x011b00 /* 1.27 */ -# define GPG_ERR_WRONG_NAME 313 -#endif - -#if GPG_ERROR_VERSION_NUMBER < 0x011a00 /* 1.26 */ -# define GPG_ERR_UNKNOWN_FLAG 309 -# define GPG_ERR_INV_ORDER 310 -# define GPG_ERR_ALREADY_FETCHED 311 -# define GPG_ERR_TRY_LATER 312 -# define GPG_ERR_SYSTEM_BUG 666 -# define GPG_ERR_DNS_UNKNOWN 711 -# define GPG_ERR_DNS_SECTION 712 -# define GPG_ERR_DNS_ADDRESS 713 -# define GPG_ERR_DNS_NO_QUERY 714 -# define GPG_ERR_DNS_NO_ANSWER 715 -# define GPG_ERR_DNS_CLOSED 716 -# define GPG_ERR_DNS_VERIFY 717 -# define GPG_ERR_DNS_TIMEOUT 718 -#endif - #ifndef EXTERN_UNLESS_MAIN_MODULE # if !defined (INCLUDED_BY_MAIN_MODULE) # define EXTERN_UNLESS_MAIN_MODULE extern diff --git a/configure.ac b/configure.ac index 95d57e371..a030af00e 100644 --- a/configure.ac +++ b/configure.ac @@ -54,7 +54,7 @@ AC_INIT([mym4_package],[mym4_version], [https://bugs.gnupg.org]) # build-aux/speedo.mk and Makefile.am AC_DEFINE_UNQUOTED(GNUPG_SWDB_TAG, "gnupg22", [swdb tag for this branch]) -NEED_GPG_ERROR_VERSION=1.25 +NEED_GPG_ERROR_VERSION=1.27 NEED_LIBGCRYPT_API=1 NEED_LIBGCRYPT_VERSION=1.8.0 |