Cygwin to use DSO_FLFCN and mingw to use DSO_WIN32.

diff --git a/Configure b/Configure
index 3c9f96d806c5ad007bd9e663e6bced9d783369b8..65cf4006fa29505f9fea66be103943c85b9cf63c 100755 (executable)
--- a/Configure
+++ b/Configure
@@ -473,15 +473,15 @@ my %table=(
 "BC-16","bcc:::(unknown):WIN16::BN_LLONG DES_PTR RC4_INDEX SIXTEEN_BIT:::",
 
 # MinGW
-"mingw", "gcc:-mno-cygwin -DL_ENDIAN -fomit-frame-pointer -O3 -march=i486 -Wall:::MINGW32:-mno-cygwin -lwsock32 -lgdi32:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_coff_asm}:win32:cygwin-shared:-D_DLL:-shared:.dll",
+"mingw", "gcc:-mno-cygwin -DL_ENDIAN -fomit-frame-pointer -O3 -march=i486 -Wall:::MINGW32:-lwsock32 -lgdi32:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_coff_asm}:win32:cygwin-shared:-D_DLL:-mno-cygwin -shared:.dll",
 
 # UWIN 
 "UWIN", "cc:-DTERMIOS -DL_ENDIAN -O -Wall:::UWIN::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${no_asm}:win32",
 
 # Cygwin
 "Cygwin-pre1.3", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::(unknown):CYGWIN32::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${no_asm}:win32",
-"Cygwin", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -march=i486 -Wall:::CYGWIN32::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_coff_asm}:win32:cygwin-shared:-D_DLL:-shared:.dll",
-"debug-Cygwin", "gcc:-DTERMIOS -DL_ENDIAN -march=i486 -Wall -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DOPENSSL_NO_ASM -g -Wformat -Wshadow -Wmissing-prototypes -Wmissing-declarations -Werror:::CYGWIN32:::${no_asm}:win32:cygwin-shared:::.dll",
+"Cygwin", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -march=i486 -Wall:::CYGWIN32::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_coff_asm}:dlfcn:cygwin-shared:-D_DLL:-shared:.dll",
+"debug-Cygwin", "gcc:-DTERMIOS -DL_ENDIAN -march=i486 -Wall -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DOPENSSL_NO_ASM -g -Wformat -Wshadow -Wmissing-prototypes -Wmissing-declarations -Werror:::CYGWIN32:::${no_asm}:dlfcn:cygwin-shared:-D_DLL:-shared:.dll",
 
 # NetWare from David Ward (dsward@novell.com) - requires MetroWerks NLM development tools
 # netware-clib => legacy CLib c-runtime support

diff --git a/TABLE b/TABLE
index 95878633e491b26c5aa7b12b622eb1cfcdae22ee..76ca810e4606830af76f52258b0b331bd3dc3982 100644 (file)
--- a/TABLE
+++ b/TABLE
@@ -316,7 +316,7 @@ $cast_obj     = cx86-cof.o
 $rc4_obj      = rx86-cof.o
 $rmd160_obj   = /rm86-cof.o
 $rc5_obj      = r586-cof.o
-$dso_scheme   = win32
+$dso_scheme   = dlfcn
 $shared_target= cygwin-shared
 $shared_cflag = -D_DLL
 $shared_ldflag = -shared
@@ -1234,10 +1234,10 @@ $cast_obj     =
 $rc4_obj      = 
 $rmd160_obj   = 
 $rc5_obj      = 
-$dso_scheme   = win32
+$dso_scheme   = dlfcn
 $shared_target= cygwin-shared
-$shared_cflag = 
-$shared_ldflag = 
+$shared_cflag = -D_DLL
+$shared_ldflag = -shared
 $shared_extension = .dll
 $ranlib       = 
 $arflags      = 
@@ -3084,7 +3084,7 @@ $cflags       = -mno-cygwin -DL_ENDIAN -fomit-frame-pointer -O3 -march=i486 -Wal
 $unistd       = 
 $thread_cflag = 
 $sys_id       = MINGW32
-$lflags       = -mno-cygwin -lwsock32 -lgdi32
+$lflags       = -lwsock32 -lgdi32
 $bn_ops       = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT
 $cpuid_obj    = x86cpuid-cof.o
 $bn_obj       = bn86-cof.o co86-cof.o
@@ -3100,7 +3100,7 @@ $rc5_obj      = r586-cof.o
 $dso_scheme   = win32
 $shared_target= cygwin-shared
 $shared_cflag = -D_DLL
-$shared_ldflag = -shared
+$shared_ldflag = -mno-cygwin -shared
 $shared_extension = .dll
 $ranlib       = 
 $arflags      = 

diff --git a/crypto/dso/dso_win32.c b/crypto/dso/dso_win32.c
index 02e051595aa354a1d243b7d6764f5fd490f36598..1dcafc6eab44c1d3d7580274af3a2e50dab0b08a 100644 (file)
--- a/crypto/dso/dso_win32.c
+++ b/crypto/dso/dso_win32.c
@@ -61,7 +61,7 @@
 #include "cryptlib.h"
 #include <openssl/dso.h>
 
-#if !defined(OPENSSL_SYS_WIN32) || defined(OPENSSL_SYS_WINCE)
+#if !defined(DSO_WIN32)
 DSO_METHOD *DSO_METHOD_win32(void)
        {
        return NULL;