From: Richard Levitte <levitte@openssl.org>
Date: Tue, 27 Jul 2004 13:58:25 +0000 (+0000)
Subject: The compiler may complain about what looks like a double definition of a
X-Git-Tag: OpenSSL_0_9_7e~45
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=e81ef01a0a01aad1f0bad9b07b2da928029491cd;p=oweals%2Fopenssl.git

The compiler may complain about what looks like a double definition of a
static variable
---

diff --git a/e_os2.h b/e_os2.h
index a943f07d6c..db8b8e1aa4 100644
--- a/e_os2.h
+++ b/e_os2.h
@@ -258,9 +258,10 @@ extern "C" {
 	#define foobar OPENSSL_GLOBAL_REF(foobar)
 */
 #ifdef OPENSSL_EXPORT_VAR_AS_FUNCTION
-# define OPENSSL_IMPLEMENT_GLOBAL(type,name) static type _hide_##name; \
-        type *_shadow_##name(void) { return &_hide_##name; } \
-        static type _hide_##name
+# define OPENSSL_IMPLEMENT_GLOBAL(type,name)			     \
+	extern static type _hide_##name;			     \
+	type *_shadow_##name(void) { return &_hide_##name; }	     \
+	static type _hide_##name
 # define OPENSSL_DECLARE_GLOBAL(type,name) type *_shadow_##name(void)
 # define OPENSSL_GLOBAL_REF(name) (*(_shadow_##name()))
 #else