agent: Resolve conflict of util.h.
authorNIIBE Yutaka <gniibe@fsij.org>
Tue, 7 Mar 2017 10:22:48 +0000 (19:22 +0900)
committerNIIBE Yutaka <gniibe@fsij.org>
Tue, 7 Mar 2017 10:22:48 +0000 (19:22 +0900)
commit176e07ce10d892fa7c7b96725b38b2fec9a1f916
treea3f31fc33d883a1aa152f1f0eb9cbb2e5f1d374e
parent8f0bf644bc693647805251732b90cc505c4b5f71
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>
16 files changed:
agent/Makefile.am
agent/call-pinentry.c
agent/call-scd.c
agent/command-ssh.c
agent/command.c
agent/cvt-openpgp.c
agent/divert-scd.c
agent/findkey.c
agent/genkey.c
agent/gpg-agent.c
agent/pksign.c
agent/preset-passphrase.c
agent/protect-tool.c
agent/protect.c
agent/trustlist.c
agent/w32main.c