aboutsummaryrefslogtreecommitdiffstats
path: root/common
diff options
context:
space:
mode:
Diffstat (limited to 'common')
-rw-r--r--common/iobuf.c1
-rw-r--r--common/iobuf.h9
-rw-r--r--common/util.h8
3 files changed, 10 insertions, 8 deletions
diff --git a/common/iobuf.c b/common/iobuf.c
index db5d062cd..43f2e101c 100644
--- a/common/iobuf.c
+++ b/common/iobuf.c
@@ -123,6 +123,7 @@ struct close_cache_s
typedef struct close_cache_s *close_cache_t;
static close_cache_t close_cache;
+int iobuf_debug_mode;
#ifdef HAVE_W32_SYSTEM
diff --git a/common/iobuf.h b/common/iobuf.h
index 9c9650c61..a3d9bd547 100644
--- a/common/iobuf.h
+++ b/common/iobuf.h
@@ -249,14 +249,7 @@ struct iobuf_struct
int subno;
};
-#ifndef EXTERN_UNLESS_MAIN_MODULE
-#if defined (__riscos__) && !defined (INCLUDED_BY_MAIN_MODULE)
-#define EXTERN_UNLESS_MAIN_MODULE extern
-#else
-#define EXTERN_UNLESS_MAIN_MODULE
-#endif
-#endif
-EXTERN_UNLESS_MAIN_MODULE int iobuf_debug_mode;
+extern int iobuf_debug_mode;
/* Change the default size for all IOBUFs to KILOBYTE. This needs to
diff --git a/common/util.h b/common/util.h
index 8ad805832..a6bab2415 100644
--- a/common/util.h
+++ b/common/util.h
@@ -48,6 +48,14 @@
#define GPG_ERR_KEYBOXD 317
#endif /*GPG_ERROR_VERSION_NUMBER*/
+#ifndef EXTERN_UNLESS_MAIN_MODULE
+# if !defined (INCLUDED_BY_MAIN_MODULE)
+# define EXTERN_UNLESS_MAIN_MODULE extern
+# else
+# define EXTERN_UNLESS_MAIN_MODULE
+# endif
+#endif
+
/* Hash function used with libksba. */
#define HASH_FNC ((void (*)(void *, const void*,size_t))gcry_md_write)