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.h7
3 files changed, 9 insertions, 8 deletions
diff --git a/common/iobuf.c b/common/iobuf.c
index 589bdf9f6..efbf21cbc 100644
--- a/common/iobuf.c
+++ b/common/iobuf.c
@@ -118,6 +118,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 22e02daad..624e154d8 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;
/* Returns whether the specified filename corresponds to a pipe. In
diff --git a/common/util.h b/common/util.h
index 24722227a..4d763f078 100644
--- a/common/util.h
+++ b/common/util.h
@@ -55,6 +55,13 @@
# define GPG_ERR_DNS_TIMEOUT 718
#endif
+#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)