diff options
| -rw-r--r-- | common/mapstrings.c | 8 | ||||
| -rw-r--r-- | common/util.h | 3 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | g13/g13.c | 2 | ||||
| -rw-r--r-- | sm/gpgsm.c | 5 | ||||
| -rw-r--r-- | tools/gpg-wks-client.c | 4 | ||||
| -rw-r--r-- | tools/gpgconf.c | 4 |
7 files changed, 2 insertions, 26 deletions
diff --git a/common/mapstrings.c b/common/mapstrings.c index 9efe95c0d..172e198ea 100644 --- a/common/mapstrings.c +++ b/common/mapstrings.c @@ -154,14 +154,6 @@ map_static_macro_string (const char *string) membuf_t mb; char *p; - /* We use a hack if we don't use the fixed gpgrt 1.47 - * (commit 885a287a57cf060b4c5b441822c09d23b8dee2bd) */ -#if GPGRT_VERSION_NUMBER < 0x012f00 - if (string && !strncmp (string, "Project-Id-Version:", 19) - && strstr (string, "PO-Revision-Date:")) - return ""; -#endif - if ((s = already_mapped (string))) return s; s = string; diff --git a/common/util.h b/common/util.h index a326704eb..1fc04f9dd 100644 --- a/common/util.h +++ b/common/util.h @@ -39,9 +39,6 @@ * libgpg-error version. Define them here. * Example: (#if GPG_ERROR_VERSION_NUMBER < 0x011500 // 1.21) */ -#if GPGRT_VERSION_NUMBER < 0x013800 /* 1.56 */ -# define GPG_ERR_UNEXPECTED_PACKET 216 -#endif #ifndef EXTERN_UNLESS_MAIN_MODULE diff --git a/configure.ac b/configure.ac index 407f31bd4..817ae804c 100644 --- a/configure.ac +++ b/configure.ac @@ -57,7 +57,7 @@ AC_INIT([mym4_package],[mym4_version],[https://bugs.gnupg.org]) # As well as the source info for the man pages. AC_DEFINE_UNQUOTED(GNUPG_SWDB_TAG, "gnupg26", [swdb tag for this branch]) -NEED_GPGRT_VERSION=1.51 +NEED_GPGRT_VERSION=1.56 NEED_LIBGCRYPT_API=1 NEED_LIBGCRYPT_VERSION=1.11.0 @@ -454,9 +454,7 @@ main (int argc, char **argv) pargs.argv = &argv; pargs.flags |= (ARGPARSE_FLAG_RESET | ARGPARSE_FLAG_KEEP -#if GPGRT_VERSION_NUMBER >= 0x013000 /* >= 1.48 */ | ARGPARSE_FLAG_COMMAND -#endif | ARGPARSE_FLAG_SYS | ARGPARSE_FLAG_USER); diff --git a/sm/gpgsm.c b/sm/gpgsm.c index 57148d03e..d1f9a59d3 100644 --- a/sm/gpgsm.c +++ b/sm/gpgsm.c @@ -2020,15 +2020,10 @@ main ( int argc, char **argv) else wrong_args ("--sign [datafile]"); -#if GPGRT_VERSION_NUMBER >= 0x012700 /* >= 1.39 */ if (err) gpgrt_fcancel (fp); else es_fclose (fp); -#else - (void)err; - es_fclose (fp); -#endif } break; diff --git a/tools/gpg-wks-client.c b/tools/gpg-wks-client.c index 14854ac15..9a28d6ae1 100644 --- a/tools/gpg-wks-client.c +++ b/tools/gpg-wks-client.c @@ -212,11 +212,9 @@ my_strusage( int level ) static void wrong_args (const char *text, const char *text2) { -#if GPGRT_VERSION_NUMBER >= 0x013000 /* >= 1.48 */ /* Skip the leading dashes if build with command support. */ if (text[0] == '-' && text[1] == '-' && text[2]) text += 2; -#endif es_fprintf (es_stderr, _("usage: %s %s [options] %s\n"), gpgrt_strusage (11), text, text2); exit (2); @@ -330,9 +328,7 @@ main (int argc, char **argv) pargs.argc = &argc; pargs.argv = &argv; pargs.flags = ARGPARSE_FLAG_KEEP; -#if GPGRT_VERSION_NUMBER >= 0x013000 /* >= 1.48 */ pargs.flags |= ARGPARSE_FLAG_COMMAND; -#endif cmd = parse_arguments (&pargs, opts); gpgrt_argparse (NULL, &pargs, NULL); diff --git a/tools/gpgconf.c b/tools/gpgconf.c index 8f565793a..9fcd5dfd5 100644 --- a/tools/gpgconf.c +++ b/tools/gpgconf.c @@ -1493,7 +1493,7 @@ my_read_reg_string (const char *name, int *r_hklm_fallback) { #ifdef HAVE_W32_SYSTEM return read_w32_reg_string (name, r_hklm_fallback); -#elif GPGRT_VERSION_NUMBER >= 0x013400 /* 1.52 */ +#else static gpgrt_nvc_t registry; static int no_registry; const char *s; @@ -1558,8 +1558,6 @@ my_read_reg_string (const char *name, int *r_hklm_fallback) xfree (namebuffer); s = e? gpgrt_nve_value (e) : NULL; return s? xtrystrdup (s) : NULL; -#else /* GpgRT too old */ - return NULL; #endif } |