aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndy Polyakov <appro@openssl.org>2005-04-13 21:10:07 +0000
committerAndy Polyakov <appro@openssl.org>2005-04-13 21:10:07 +0000
commit4f1c33b43010d5746ac295165672b64a8d38b5e9 (patch)
treeaa7a1311431afc6b157f74bc4f9c8bc68497fc0e
parent1334462ab3548025df4672f3d52fd5c13e25ff18 (diff)
downloadopenssl-4f1c33b43010d5746ac295165672b64a8d38b5e9.tar.gz
Addenum to http://cvs.openssl.org/chngview?cn=13054.
-rw-r--r--TABLE8
-rw-r--r--e_os2.h4
2 files changed, 6 insertions, 6 deletions
diff --git a/TABLE b/TABLE
index 6d09c5398a..3e18bfc601 100644
--- 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 60f9b5c9c7..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