From 66ecdf3bfb0320647b8e2ab9f93ffc3f231e54e8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ulf=20M=C3=B6ller?= Date: Sat, 22 Feb 2003 18:00:14 +0000 Subject: [PATCH] more mingw related cleanups. --- Configure | 6 ++---- apps/apps.c | 4 ---- crypto/bn/bntest.c | 9 --------- crypto/bn/exptest.c | 3 --- crypto/dh/dhtest.c | 7 ------- crypto/dsa/dsatest.c | 3 --- crypto/threads/mttest.c | 5 ----- ms/mingw32.bat | 2 +- ms/mw.bat | 5 ----- ssl/ssltest.c | 1 - 10 files changed, 3 insertions(+), 42 deletions(-) diff --git a/Configure b/Configure index 3df57f6338..0f64c4cb0a 100755 --- a/Configure +++ b/Configure @@ -506,10 +506,8 @@ my %table=( "BC-32","bcc32::::WIN32::BN_LLONG DES_PTR RC4_INDEX EXPORT_VAR_AS_FN::::::::::win32", "BC-16","bcc:::(unknown):WIN16::BN_LLONG DES_PTR RC4_INDEX SIXTEEN_BIT:::", -# Mingw32 -# (Note: the real CFLAGS for Windows builds are defined by util/mk1mf.pl -# and its library files in util/pl/*) -"Mingw32", "gcc:-DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall:::::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::win32", +# MinGW +"mingw", "gcc:-DL_ENDIAN -fomit-frame-pointer -O3 -march=i486 -mno-cygwin -Wall:::MINGW32:-mno-cygwin -lwsock32 -lgdi32:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}:win32::::.dll", # UWIN "UWIN", "cc:-DTERMIOS -DL_ENDIAN -O -Wall:::UWIN::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::win32", diff --git a/apps/apps.c b/apps/apps.c index ec3e391b66..007e3e06c3 100644 --- a/apps/apps.c +++ b/apps/apps.c @@ -140,10 +140,6 @@ #include "apps.h" #undef NON_MAIN -#ifdef OPENSSL_SYS_WINDOWS -# include "bss_file.c" -#endif - typedef struct { char *name; unsigned long flag; diff --git a/crypto/bn/bntest.c b/crypto/bn/bntest.c index 0149e8c3c4..fe057dc22f 100644 --- a/crypto/bn/bntest.c +++ b/crypto/bn/bntest.c @@ -87,10 +87,6 @@ #include #include -#ifdef OPENSSL_SYS_WINDOWS -#include "../bio/bss_file.c" -#endif - const int num0 = 100; /* number of tests */ const int num1 = 50; /* additional tests for some functions */ const int num2 = 5; /* number of tests for slow functions */ @@ -124,11 +120,6 @@ int test_sqrt(BIO *bp,BN_CTX *ctx); int rand_neg(void); static int results=0; -#ifdef OPENSSL_NO_STDIO -#define APPS_WIN16 -#include "bss_file.c" -#endif - static unsigned char lst[]="\xC6\x4F\x43\x04\x2A\xEA\xCA\x6E\x58\x36\x80\x5B\xE8\xC9" "\x9B\x04\x5D\x48\x36\xC2\xFD\x16\xC9\x64\xF0"; diff --git a/crypto/bn/exptest.c b/crypto/bn/exptest.c index 621e6a9eee..b09cf88705 100644 --- a/crypto/bn/exptest.c +++ b/crypto/bn/exptest.c @@ -66,9 +66,6 @@ #include #include #include -#ifdef OPENSSL_SYS_WINDOWS -#include "../bio/bss_file.c" -#endif #define NUM_BITS (BN_BITS*2) diff --git a/crypto/dh/dhtest.c b/crypto/dh/dhtest.c index 33a49f2d7d..dc25283f7c 100644 --- a/crypto/dh/dhtest.c +++ b/crypto/dh/dhtest.c @@ -68,9 +68,6 @@ #include "../e_os.h" -#ifdef OPENSSL_SYS_WINDOWS -#include "../bio/bss_file.c" -#endif #include #include #include @@ -93,10 +90,6 @@ int main(int argc, char *argv[]) #endif static void MS_CALLBACK cb(int p, int n, void *arg); -#ifdef OPENSSL_NO_STDIO -#define APPS_WIN16 -#include "bss_file.c" -#endif static const char rnd_seed[] = "string to make the random number generator think it has entropy"; diff --git a/crypto/dsa/dsatest.c b/crypto/dsa/dsatest.c index 75eca097a5..940d97d0e6 100644 --- a/crypto/dsa/dsatest.c +++ b/crypto/dsa/dsatest.c @@ -77,9 +77,6 @@ #ifndef OPENSSL_NO_ENGINE #include #endif -#ifdef OPENSSL_SYS_WINDOWS -#include "../bio/bss_file.c" -#endif #ifdef OPENSSL_NO_DSA int main(int argc, char *argv[]) diff --git a/crypto/threads/mttest.c b/crypto/threads/mttest.c index 7142e4edc7..54d598565d 100644 --- a/crypto/threads/mttest.c +++ b/crypto/threads/mttest.c @@ -86,11 +86,6 @@ #include #include -#ifdef OPENSSL_NO_FP_API -#define APPS_WIN16 -#include "../buffer/bss_file.c" -#endif - #define TEST_SERVER_CERT "../../apps/server.pem" #define TEST_CLIENT_CERT "../../apps/client.pem" diff --git a/ms/mingw32.bat b/ms/mingw32.bat index df8e0af15f..8c7c63e0f2 100644 --- a/ms/mingw32.bat +++ b/ms/mingw32.bat @@ -1,7 +1,7 @@ @rem OpenSSL with Mingw32+GNU as @rem --------------------------- -perl Configure Mingw32 %1 %2 %3 %4 %5 %6 %7 %8 +perl Configure mingw %1 %2 %3 %4 %5 %6 %7 %8 @echo off diff --git a/ms/mw.bat b/ms/mw.bat index dc37913b71..c5ccd693e3 100644 --- a/ms/mw.bat +++ b/ms/mw.bat @@ -4,17 +4,12 @@ @rem Makefile perl util\mkfiles.pl >MINFO perl util\mk1mf.pl Mingw32 >ms\mingw32.mak -perl util\mk1mf.pl Mingw32-files >ms\mingw32f.mak @rem DLL definition files perl util\mkdef.pl 32 libeay >ms\libeay32.def if errorlevel 1 goto end perl util\mkdef.pl 32 ssleay >ms\ssleay32.def if errorlevel 1 goto end -@rem Create files -- this can be skipped if using the GNU file utilities -make -f ms/mingw32f.mak -echo You can ignore the error messages above - @rem Build the libraries make -f ms/mingw32.mak if errorlevel 1 goto end diff --git a/ssl/ssltest.c b/ssl/ssltest.c index 49360d5f9f..45b211b4c6 100644 --- a/ssl/ssltest.c +++ b/ssl/ssltest.c @@ -147,7 +147,6 @@ #ifdef OPENSSL_SYS_WINDOWS #include -#include "../crypto/bio/bss_file.c" #else #include OPENSSL_UNISTD #endif -- 2.25.1