X-Git-Url: https://git.openssl.org/?p=openssl.git;a=blobdiff_plain;f=e_os2.h;h=5cceb8519905297b117d071fae33244aa9eee9c2;hp=04d00ec78d70fa383731c64aca8b5846793ebb08;hb=5d6c4985d1ae7f2a036429ad3ace3d4161a94280;hpb=28a80034678e7b21b9d812e3eeb88596082dbf92

diff --git a/e_os2.h b/e_os2.h
index 04d00ec78d..5cceb85199 100644
--- a/e_os2.h
+++ b/e_os2.h
@@ -246,8 +246,8 @@ extern "C" {
 # define OPENSSL_IMPORT globalref
 # define OPENSSL_GLOBAL globaldef
 #elif defined(OPENSSL_SYS_WINDOWS) && defined(OPENSSL_OPT_WINDLL)
-# define OPENSSL_EXPORT extern _declspec(dllexport)
-# define OPENSSL_IMPORT extern _declspec(dllimport)
+# define OPENSSL_EXPORT extern __declspec(dllexport)
+# define OPENSSL_IMPORT extern __declspec(dllimport)
 # define OPENSSL_GLOBAL
 #else
 # define OPENSSL_EXPORT extern
@@ -267,9 +267,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 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