diff options
Diffstat (limited to 'g10')
| -rw-r--r-- | g10/gpgcompose.c | 1 | ||||
| -rw-r--r-- | g10/main.h | 2 | ||||
| -rw-r--r-- | g10/options.h | 8 | ||||
| -rw-r--r-- | g10/test.c | 1 |
4 files changed, 3 insertions, 9 deletions
diff --git a/g10/gpgcompose.c b/g10/gpgcompose.c index bba31592d..229a4e5ea 100644 --- a/g10/gpgcompose.c +++ b/g10/gpgcompose.c @@ -20,6 +20,7 @@ #include <config.h> #include <errno.h> +#define INCLUDED_BY_MAIN_MODULE 1 #include "gpg.h" #include "packet.h" #include "keydb.h" diff --git a/g10/main.h b/g10/main.h index 90e164fda..fe666edf8 100644 --- a/g10/main.h +++ b/g10/main.h @@ -22,9 +22,9 @@ #include "../common/types.h" #include "../common/iobuf.h" +#include "../common/util.h" #include "keydb.h" #include "keyedit.h" -#include "../common/util.h" /* It could be argued that the default cipher should be 3DES rather than AES128, and the default compression should be 0 diff --git a/g10/options.h b/g10/options.h index 4510819b9..efe7f52d0 100644 --- a/g10/options.h +++ b/g10/options.h @@ -30,14 +30,6 @@ #include "../common/session-env.h" #include "../common/compliance.h" -#ifndef EXTERN_UNLESS_MAIN_MODULE -/* Norcraft can't cope with common symbols */ -#if defined (__riscos__) && !defined (INCLUDED_BY_MAIN_MODULE) -#define EXTERN_UNLESS_MAIN_MODULE extern -#else -#define EXTERN_UNLESS_MAIN_MODULE -#endif -#endif /* Declaration of a keyserver spec type. The definition is found in ../common/keyserver.h. */ diff --git a/g10/test.c b/g10/test.c index 375f361a7..648148a10 100644 --- a/g10/test.c +++ b/g10/test.c @@ -22,6 +22,7 @@ #include <stdlib.h> #include <string.h> +#define INCLUDED_BY_MAIN_MODULE 1 #include "gpg.h" /* A unit test consists of one or more tests. Tests can be broken |