diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/gpg-card.c | 2 | ||||
| -rw-r--r-- | tools/gpg-card.h | 1 | ||||
| -rw-r--r-- | tools/gpg-wks-client.c | 1 | ||||
| -rw-r--r-- | tools/gpg-wks-server.c | 1 | ||||
| -rw-r--r-- | tools/gpg-wks.h | 1 | ||||
| -rw-r--r-- | tools/gpgconf.c | 1 | ||||
| -rw-r--r-- | tools/gpgconf.h | 1 | ||||
| -rw-r--r-- | tools/gpgtar.c | 1 | ||||
| -rw-r--r-- | tools/gpgtar.h | 2 |
9 files changed, 11 insertions, 0 deletions
diff --git a/tools/gpg-card.c b/tools/gpg-card.c index 9979020a3..3d87e2ef2 100644 --- a/tools/gpg-card.c +++ b/tools/gpg-card.c @@ -27,6 +27,8 @@ # include <readline/readline.h> #endif /*HAVE_LIBREADLINE*/ +#define INCLUDED_BY_MAIN_MODULE 1 + #include "../common/util.h" #include "../common/status.h" #include "../common/i18n.h" diff --git a/tools/gpg-card.h b/tools/gpg-card.h index 02c1ed314..5d75c2bb9 100644 --- a/tools/gpg-card.h +++ b/tools/gpg-card.h @@ -25,6 +25,7 @@ /* We keep all global options in the structure OPT. */ +EXTERN_UNLESS_MAIN_MODULE struct { int interactive; diff --git a/tools/gpg-wks-client.c b/tools/gpg-wks-client.c index 861a1fc61..98ca2fb38 100644 --- a/tools/gpg-wks-client.c +++ b/tools/gpg-wks-client.c @@ -25,6 +25,7 @@ #include <sys/types.h> #include <sys/stat.h> +#define INCLUDED_BY_MAIN_MODULE 1 #include "../common/util.h" #include "../common/status.h" #include "../common/i18n.h" diff --git a/tools/gpg-wks-server.c b/tools/gpg-wks-server.c index 2082fb87d..8cdbfaf36 100644 --- a/tools/gpg-wks-server.c +++ b/tools/gpg-wks-server.c @@ -32,6 +32,7 @@ #include <sys/stat.h> #include <dirent.h> +#define INCLUDED_BY_MAIN_MODULE 1 #include "../common/util.h" #include "../common/init.h" #include "../common/sysutils.h" diff --git a/tools/gpg-wks.h b/tools/gpg-wks.h index 9acd7c37f..6c5dc8b17 100644 --- a/tools/gpg-wks.h +++ b/tools/gpg-wks.h @@ -30,6 +30,7 @@ /* We keep all global options in the structure OPT. */ +EXTERN_UNLESS_MAIN_MODULE struct { int verbose; diff --git a/tools/gpgconf.c b/tools/gpgconf.c index 596aa957d..6dd3c0c9c 100644 --- a/tools/gpgconf.c +++ b/tools/gpgconf.c @@ -25,6 +25,7 @@ #include <string.h> #include <unistd.h> +#define INCLUDED_BY_MAIN_MODULE 1 #include "gpgconf.h" #include "../common/i18n.h" #include "../common/sysutils.h" diff --git a/tools/gpgconf.h b/tools/gpgconf.h index 192259789..adb90a1f6 100644 --- a/tools/gpgconf.h +++ b/tools/gpgconf.h @@ -23,6 +23,7 @@ #include "../common/util.h" /* We keep all global options in the structure OPT. */ +EXTERN_UNLESS_MAIN_MODULE struct { int verbose; /* Verbosity level. */ diff --git a/tools/gpgtar.c b/tools/gpgtar.c index b33aa6d0f..e5cbde4af 100644 --- a/tools/gpgtar.c +++ b/tools/gpgtar.c @@ -34,6 +34,7 @@ #include <string.h> #include <assert.h> +#define INCLUDED_BY_MAIN_MODULE 1 #include "../common/util.h" #include "../common/i18n.h" #include "../common/sysutils.h" diff --git a/tools/gpgtar.h b/tools/gpgtar.h index 1a1b913d7..74bfb56e8 100644 --- a/tools/gpgtar.h +++ b/tools/gpgtar.h @@ -23,7 +23,9 @@ #include "../common/util.h" #include "../common/strlist.h" + /* We keep all global options in the structure OPT. */ +EXTERN_UNLESS_MAIN_MODULE struct { int verbose; |