aboutsummaryrefslogtreecommitdiffstats
path: root/agent
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2009-09-23 10:28:41 +0000
committerWerner Koch <[email protected]>2009-09-23 10:28:41 +0000
commit1d0e9816e4a665da90d4798d7814b4e93346d7a9 (patch)
treee6c206190a7b62c709deec56bd88e2d4e964f22d /agent
parent2009-09-23 Marcus Brinkmann <[email protected]> (diff)
downloadgnupg-1d0e9816e4a665da90d4798d7814b4e93346d7a9.tar.gz
gnupg-1d0e9816e4a665da90d4798d7814b4e93346d7a9.zip
s/DOTLOCK/dotlock_t/.
Add some stuff for g13.
Diffstat (limited to 'agent')
-rw-r--r--agent/ChangeLog6
-rw-r--r--agent/command.c4
2 files changed, 6 insertions, 4 deletions
diff --git a/agent/ChangeLog b/agent/ChangeLog
index 2544274a2..59674b49b 100644
--- a/agent/ChangeLog
+++ b/agent/ChangeLog
@@ -1,3 +1,9 @@
+2009-09-23 Werner Koch <[email protected]>
+
+ * command.c (register_commands) [HAVE_ASSUAN_SET_IO_MONITOR]:
+ Remove cpp condition.
+ (start_command_handler) [HAVE_ASSUAN_SET_IO_MONITOR]: Ditto.
+
2009-09-23 Marcus Brinkmann <[email protected]>
* gpg-agent.c (parse_rereadable_options): Don't set global assuan
diff --git a/agent/command.c b/agent/command.c
index b863a6a8c..7e2638106 100644
--- a/agent/command.c
+++ b/agent/command.c
@@ -1866,9 +1866,7 @@ register_commands (assuan_context_t ctx)
if (rc)
return rc;
}
-#ifdef HAVE_ASSUAN_SET_IO_MONITOR
assuan_register_post_cmd_notify (ctx, post_cmd_notify);
-#endif
assuan_register_reset_notify (ctx, reset_notify);
assuan_register_option_handler (ctx, option_handler);
return 0;
@@ -1934,9 +1932,7 @@ start_command_handler (ctrl_t ctrl, gnupg_fd_t listen_fd, gnupg_fd_t fd)
if (DBG_ASSUAN)
assuan_set_log_stream (ctx, log_get_stream ());
-#ifdef HAVE_ASSUAN_SET_IO_MONITOR
assuan_set_io_monitor (ctx, io_monitor, NULL);
-#endif
for (;;)
{