From 176e07ce10d892fa7c7b96725b38b2fec9a1f916 Mon Sep 17 00:00:00 2001 From: NIIBE Yutaka Date: Tue, 7 Mar 2017 19:22:48 +0900 Subject: [PATCH] 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 --- agent/Makefile.am | 2 +- agent/call-pinentry.c | 4 ++-- agent/call-scd.c | 2 +- agent/command-ssh.c | 6 +++--- agent/command.c | 2 +- agent/cvt-openpgp.c | 4 ++-- agent/divert-scd.c | 4 ++-- agent/findkey.c | 2 +- agent/genkey.c | 6 +++--- agent/gpg-agent.c | 10 +++++----- agent/pksign.c | 2 +- agent/preset-passphrase.c | 6 +++--- agent/protect-tool.c | 6 +++--- agent/protect.c | 2 +- agent/trustlist.c | 2 +- agent/w32main.c | 2 +- 16 files changed, 31 insertions(+), 31 deletions(-) diff --git a/agent/Makefile.am b/agent/Makefile.am index 045566ebc..668de2a29 100644 --- a/agent/Makefile.am +++ b/agent/Makefile.am @@ -28,7 +28,7 @@ noinst_PROGRAMS = $(TESTS) EXTRA_DIST = ChangeLog-2011 gpg-agent-w32info.rc -AM_CPPFLAGS = -I$(top_srcdir)/common +AM_CPPFLAGS = include $(top_srcdir)/am/cmacros.am diff --git a/agent/call-pinentry.c b/agent/call-pinentry.c index 0af1854a7..a35a3fbff 100644 --- a/agent/call-pinentry.c +++ b/agent/call-pinentry.c @@ -37,8 +37,8 @@ #include "agent.h" #include -#include "sysutils.h" -#include "i18n.h" +#include "../common/sysutils.h" +#include "../common/i18n.h" #ifdef _POSIX_OPEN_MAX #define MAX_OPEN_FDS _POSIX_OPEN_MAX diff --git a/agent/call-scd.c b/agent/call-scd.c index c86eb741a..09ec4fd49 100644 --- a/agent/call-scd.c +++ b/agent/call-scd.c @@ -39,7 +39,7 @@ #include "agent.h" #include -#include "strlist.h" +#include "../common/strlist.h" #ifdef _POSIX_OPEN_MAX #define MAX_OPEN_FDS _POSIX_OPEN_MAX diff --git a/agent/command-ssh.c b/agent/command-ssh.c index 382f9e635..5a0254267 100644 --- a/agent/command-ssh.c +++ b/agent/command-ssh.c @@ -50,9 +50,9 @@ #include "agent.h" -#include "i18n.h" -#include "util.h" -#include "ssh-utils.h" +#include "../common/i18n.h" +#include "../common/util.h" +#include "../common/ssh-utils.h" diff --git a/agent/command.c b/agent/command.c index acc3877d9..79fb0cef2 100644 --- a/agent/command.c +++ b/agent/command.c @@ -37,7 +37,7 @@ #include "agent.h" #include -#include "i18n.h" +#include "../common/i18n.h" #include "cvt-openpgp.h" #include "../common/ssh-utils.h" #include "../common/asshelp.h" 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 #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. */ diff --git a/agent/divert-scd.c b/agent/divert-scd.c index d9d734c64..153119b38 100644 --- a/agent/divert-scd.c +++ b/agent/divert-scd.c @@ -28,8 +28,8 @@ #include #include "agent.h" -#include "i18n.h" -#include "sexp-parse.h" +#include "../common/i18n.h" +#include "../common/sexp-parse.h" static int diff --git a/agent/findkey.c b/agent/findkey.c index ac74fa98f..a196fdc3d 100644 --- a/agent/findkey.c +++ b/agent/findkey.c @@ -33,7 +33,7 @@ #include /* (we use pth_sleep) */ #include "agent.h" -#include "i18n.h" +#include "../common/i18n.h" #include "../common/ssh-utils.h" #include "../common/name-value.h" diff --git a/agent/genkey.c b/agent/genkey.c index 7fb0139a4..31742a13c 100644 --- a/agent/genkey.c +++ b/agent/genkey.c @@ -27,9 +27,9 @@ #include #include "agent.h" -#include "i18n.h" -#include "exechelp.h" -#include "sysutils.h" +#include "../common/i18n.h" +#include "../common/exechelp.h" +#include "../common/sysutils.h" static int store_key (gcry_sexp_t private, const char *passphrase, int force, diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c index 5a5b55b62..c84dce731 100644 --- a/agent/gpg-agent.c +++ b/agent/gpg-agent.c @@ -53,11 +53,11 @@ #include "agent.h" #include /* Malloc hooks and socket wrappers. */ -#include "i18n.h" -#include "sysutils.h" -#include "gc-opt-flags.h" -#include "exechelp.h" -#include "asshelp.h" +#include "../common/i18n.h" +#include "../common/sysutils.h" +#include "../common/gc-opt-flags.h" +#include "../common/exechelp.h" +#include "../common/asshelp.h" #include "../common/init.h" diff --git a/agent/pksign.c b/agent/pksign.c index 3b2fcc4f5..f0b10e6e0 100644 --- a/agent/pksign.c +++ b/agent/pksign.c @@ -29,7 +29,7 @@ #include #include "agent.h" -#include "i18n.h" +#include "../common/i18n.h" static int diff --git a/agent/preset-passphrase.c b/agent/preset-passphrase.c index b8d2aaa00..3d240b9bd 100644 --- a/agent/preset-passphrase.c +++ b/agent/preset-passphrase.c @@ -45,9 +45,9 @@ #endif #include "agent.h" -#include "simple-pwquery.h" -#include "i18n.h" -#include "sysutils.h" +#include "../common/simple-pwquery.h" +#include "../common/i18n.h" +#include "../common/sysutils.h" #include "../common/init.h" diff --git a/agent/protect-tool.c b/agent/protect-tool.c index 231274439..a193e4969 100644 --- a/agent/protect-tool.c +++ b/agent/protect-tool.c @@ -39,9 +39,9 @@ #endif #include "agent.h" -#include "i18n.h" -#include "get-passphrase.h" -#include "sysutils.h" +#include "../common/i18n.h" +#include "../common/get-passphrase.h" +#include "../common/sysutils.h" #include "../common/init.h" 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 diff --git a/agent/trustlist.c b/agent/trustlist.c index 9d3325964..5554485d6 100644 --- a/agent/trustlist.c +++ b/agent/trustlist.c @@ -31,7 +31,7 @@ #include "agent.h" #include /* fixme: need a way to avoid assuan calls here */ -#include "i18n.h" +#include "../common/i18n.h" /* A structure to store the information from the trust file. */ diff --git a/agent/w32main.c b/agent/w32main.c index 375bbdfc2..0e3927ad2 100644 --- a/agent/w32main.c +++ b/agent/w32main.c @@ -28,7 +28,7 @@ #include #include -#include "util.h" +#include "../common/util.h" #include "w32main.h" /* The instance handle has received by WinMain. */