Addenum to http://cvs.openssl.org/chngview?cn=13054.

diff --git a/TABLE b/TABLE
index 6d09c5398af4af23c426c3922e94eb0ac536c482..3e18bfc601c2cff73505e47b451373662870a6b6 100644 (file)
--- a/TABLE
+++ b/TABLE
@@ -320,7 +320,7 @@ $dso_scheme   = dlfcn
 $shared_target= cygwin-shared
 $shared_cflag = -D_WINDLL
 $shared_ldflag = -shared
-$shared_extension = .dll
+$shared_extension = .dll.a
 $ranlib       = 
 $arflags      = 
 
@@ -1238,7 +1238,7 @@ $dso_scheme   = dlfcn
 $shared_target= cygwin-shared
 $shared_cflag = -D_WINDLL
 $shared_ldflag = -shared
-$shared_extension = .dll
+$shared_extension = .dll.a
 $ranlib       = 
 $arflags      = 
 
@@ -3080,7 +3080,7 @@ $arflags      =
 
 *** mingw
 $cc           = gcc
-$cflags       = -mno-cygwin -DL_ENDIAN -fomit-frame-pointer -O3 -march=i486 -Wall
+$cflags       = -mno-cygwin -DL_ENDIAN -fomit-frame-pointer -O3 -march=i486 -Wall -D_WIN32_WINNT=0x333
 $unistd       = 
 $thread_cflag = 
 $sys_id       = MINGW32
@@ -3101,7 +3101,7 @@ $dso_scheme   = win32
 $shared_target= cygwin-shared
 $shared_cflag = -D_WINDLL
 $shared_ldflag = -mno-cygwin -shared
-$shared_extension = .dll
+$shared_extension = .dll.a
 $ranlib       = 
 $arflags      = 
 

diff --git a/e_os2.h b/e_os2.h
index 60f9b5c9c7c46f56263d944fbdce63c59aa262d8..5cceb8519905297b117d071fae33244aa9eee9c2 100644 (file)
--- 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