diff options
| author | NIIBE Yutaka <gniibe@fsij.org> | 2017-03-07 11:22:48 +0100 |
|---|---|---|
| committer | NIIBE Yutaka <gniibe@fsij.org> | 2017-03-07 11:22:48 +0100 |
| commit | 176e07ce10d892fa7c7b96725b38b2fec9a1f916 (patch) | |
| tree | a3f31fc33d883a1aa152f1f0eb9cbb2e5f1d374e /agent/cvt-openpgp.c | |
| parent | doc: Replace README.maint content. (diff) | |
| download | gnupg2-176e07ce10d892fa7c7b96725b38b2fec9a1f916.tar.xz gnupg2-176e07ce10d892fa7c7b96725b38b2fec9a1f916.zip | |
agent: Resolve conflict of util.h.
* agent/Makefile.am (AM_CPPFLAGS): Remove -I$(top_srcdir)/common.
* agent/call-pinentry.c, agent/call-scd.c: Follow the change.
* agent/command-ssh.c, agent/command.c, agent/cvt-openpgp.c: Ditto.
* agent/divert-scd.c, agent/findkey.c, agent/genkey.c: Ditto.
* agent/gpg-agent.c, agent/pksign.c, agent/preset-passphrase.c: Ditto.
* agent/protect-tool.c, agent/protect.c, agent/trustlist.c: Ditto.
* agent/w32main.c: Ditto.
--
For openpty function, we need to include util.h on some OS.
We also have util.h in common/, so this change is needed.
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
Diffstat (limited to 'agent/cvt-openpgp.c')
| -rw-r--r-- | agent/cvt-openpgp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/agent/cvt-openpgp.c b/agent/cvt-openpgp.c index 510b6ff63..ee1222113 100644 --- a/agent/cvt-openpgp.c +++ b/agent/cvt-openpgp.c @@ -25,9 +25,9 @@ #include <assert.h> #include "agent.h" -#include "i18n.h" +#include "../common/i18n.h" #include "cvt-openpgp.h" -#include "host2net.h" +#include "../common/host2net.h" /* Helper to pass data via the callback to do_unprotect. */ |