aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNIIBE Yutaka <[email protected]>2017-03-07 11:32:09 +0000
committerNIIBE Yutaka <[email protected]>2017-03-07 11:32:09 +0000
commitd6c7bf1f8ab8899faba2fb81a35b096921c38f3c (patch)
treee757372cb7c19fd32cd7761209a0c9958831d19a
parentRemove -I option to common. (diff)
downloadgnupg-d6c7bf1f8ab8899faba2fb81a35b096921c38f3c.tar.gz
gnupg-d6c7bf1f8ab8899faba2fb81a35b096921c38f3c.zip
More change for common.
* g10, scd, test, tools: Follow the change of removal of -Icommon. Signed-off-by: NIIBE Yutaka <[email protected]>
-rw-r--r--g10/seckey-cert.c6
-rw-r--r--scd/iso7816.c4
-rw-r--r--tests/gpgscm/main.c2
-rw-r--r--tools/no-libgcrypt.c2
-rw-r--r--tools/symcryptrun.c2
5 files changed, 8 insertions, 8 deletions
diff --git a/g10/seckey-cert.c b/g10/seckey-cert.c
index 61cc2ea87..a7a873986 100644
--- a/g10/seckey-cert.c
+++ b/g10/seckey-cert.c
@@ -26,14 +26,14 @@
#include <string.h>
#include "gpg.h"
-#include "util.h"
+#include "../common/util.h"
#include "packet.h"
#include "keydb.h"
#include "cipher.h"
#include "main.h"
#include "options.h"
-#include "i18n.h"
-#include "status.h"
+#include "../common/i18n.h"
+#include "../common/status.h"
#include "pkglue.h"
static int
diff --git a/scd/iso7816.c b/scd/iso7816.c
index 8f796981f..d146bd00a 100644
--- a/scd/iso7816.c
+++ b/scd/iso7816.c
@@ -32,8 +32,8 @@
#include "options.h"
#include "errors.h"
#include "memory.h"
-#include "util.h"
-#include "i18n.h"
+#include "../common/util.h"
+#include "../common/i18n.h"
#else /* GNUPG_MAJOR_VERSION != 1 */
#include "scdaemon.h"
#endif /* GNUPG_MAJOR_VERSION != 1 */
diff --git a/tests/gpgscm/main.c b/tests/gpgscm/main.c
index 3191e0597..65929f007 100644
--- a/tests/gpgscm/main.c
+++ b/tests/gpgscm/main.c
@@ -34,7 +34,7 @@
#include "scheme.h"
#include "scheme-private.h"
#include "ffi.h"
-#include "i18n.h"
+#include "../common/i18n.h"
#include "../../common/argparse.h"
#include "../../common/init.h"
#include "../../common/logging.h"
diff --git a/tools/no-libgcrypt.c b/tools/no-libgcrypt.c
index b56cc385d..873996889 100644
--- a/tools/no-libgcrypt.c
+++ b/tools/no-libgcrypt.c
@@ -18,7 +18,7 @@
#include <errno.h>
#include "../common/util.h"
-#include "i18n.h"
+#include "../common/i18n.h"
/* Replace libgcrypt's malloc functions which are used by
diff --git a/tools/symcryptrun.c b/tools/symcryptrun.c
index b32d43ac8..563e56bc3 100644
--- a/tools/symcryptrun.c
+++ b/tools/symcryptrun.c
@@ -98,7 +98,7 @@
#endif
#include <gpg-error.h>
-#include "i18n.h"
+#include "../common/i18n.h"
#include "../common/util.h"
#include "../common/init.h"
#include "../common/sysutils.h"