aboutsummaryrefslogtreecommitdiffstats
path: root/agent
diff options
context:
space:
mode:
Diffstat (limited to 'agent')
-rw-r--r--agent/gpg-agent.c4
-rw-r--r--agent/preset-passphrase.c4
-rw-r--r--agent/protect-tool.c4
3 files changed, 12 insertions, 0 deletions
diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c
index 4678cf359..d5fe939db 100644
--- a/agent/gpg-agent.c
+++ b/agent/gpg-agent.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 <stdio.h>
#include <stdlib.h>
@@ -52,6 +55,7 @@
#define GNUPG_COMMON_NEED_AFLOCAL
#include "agent.h"
#include <assuan.h> /* Malloc hooks and socket wrappers. */
+#include "../common/argparse.h" /* temporary hack. */
#include "../common/i18n.h"
#include "../common/sysutils.h"
diff --git a/agent/preset-passphrase.c b/agent/preset-passphrase.c
index 7b322a0b7..496cee73d 100644
--- a/agent/preset-passphrase.c
+++ b/agent/preset-passphrase.c
@@ -18,6 +18,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 <stdio.h>
#include <stdlib.h>
@@ -49,6 +52,7 @@
#include "../common/i18n.h"
#include "../common/sysutils.h"
#include "../common/init.h"
+#include "../common/argparse.h" /* temporary hack. */
enum cmd_and_opt_values
diff --git a/agent/protect-tool.c b/agent/protect-tool.c
index 4a307abc2..798c50e78 100644
--- a/agent/protect-tool.c
+++ b/agent/protect-tool.c
@@ -18,6 +18,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 <stdio.h>
#include <stdlib.h>
@@ -43,6 +46,7 @@
#include "../common/get-passphrase.h"
#include "../common/sysutils.h"
#include "../common/init.h"
+#include "../common/argparse.h" /* temporary hack. */
enum cmd_and_opt_values