diff options
| author | NIIBE Yutaka <[email protected]> | 2017-03-07 10:22:48 +0000 |
|---|---|---|
| committer | NIIBE Yutaka <[email protected]> | 2017-03-07 10:22:48 +0000 |
| commit | 176e07ce10d892fa7c7b96725b38b2fec9a1f916 (patch) | |
| tree | a3f31fc33d883a1aa152f1f0eb9cbb2e5f1d374e /agent/protect.c | |
| parent | doc: Replace README.maint content. (diff) | |
| download | gnupg-176e07ce10d892fa7c7b96725b38b2fec9a1f916.tar.gz gnupg-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 <[email protected]>
Diffstat (limited to 'agent/protect.c')
| -rw-r--r-- | agent/protect.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/agent/protect.c b/agent/protect.c index 7ae7e64b7..09aa50352 100644 --- a/agent/protect.c +++ b/agent/protect.c @@ -39,7 +39,7 @@ #include "agent.h" #include "cvt-openpgp.h" -#include "sexp-parse.h" +#include "../common/sexp-parse.h" /* To use the openpgp-s2k3-ocb-aes scheme by default set the value of |