diff options
Diffstat (limited to 'sm')
| -rw-r--r-- | sm/call-agent.c | 2 | ||||
| -rw-r--r-- | sm/call-dirmngr.c | 2 | ||||
| -rw-r--r-- | sm/gpgsm.c | 4 |
3 files changed, 6 insertions, 2 deletions
diff --git a/sm/call-agent.c b/sm/call-agent.c index 7ee728b74..31f7206d3 100644 --- a/sm/call-agent.c +++ b/sm/call-agent.c @@ -91,7 +91,7 @@ warn_version_mismatch (ctrl_t ctrl, assuan_context_t ctx, { gpg_error_t err; char *serverversion; - const char *myversion = strusage (13); + const char *myversion = gpgrt_strusage (13); err = get_assuan_server_version (ctx, mode, &serverversion); if (err) diff --git a/sm/call-dirmngr.c b/sm/call-dirmngr.c index f3fe1d663..4c764ea2c 100644 --- a/sm/call-dirmngr.c +++ b/sm/call-dirmngr.c @@ -158,7 +158,7 @@ warn_version_mismatch (ctrl_t ctrl, assuan_context_t ctx, { gpg_error_t err; char *serverversion; - const char *myversion = strusage (13); + const char *myversion = gpgrt_strusage (13); err = get_assuan_server_version (ctx, mode, &serverversion); if (err) diff --git a/sm/gpgsm.c b/sm/gpgsm.c index 8b4c9631d..96e14b59d 100644 --- a/sm/gpgsm.c +++ b/sm/gpgsm.c @@ -19,6 +19,9 @@ */ #include <config.h> +/* We don't want to have the macros from gpgrt here until we have + * completely replaced this module by the one from gpgrt. */ +#undef GPGRT_ENABLE_ARGPARSE_MACROS #include <errno.h> #include <stdio.h> #include <stdlib.h> @@ -33,6 +36,7 @@ #include "gpgsm.h" #include <gcrypt.h> #include <assuan.h> /* malloc hooks */ +#include "../common/argparse.h" /* temporary hack. */ #include "passphrase.h" #include "../common/shareddefs.h" |