Commit 66ecdf3b authored by Ulf Möller's avatar Ulf Möller
Browse files

more mingw related cleanups.

parent 7841edc9

Configure

+2 −4
Original line number Diff line number Diff line
@@ -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",

apps/apps.c

+0 −4
Original line number Diff line number Diff line
@@ -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;

crypto/bn/bntest.c

+0 −9
Original line number Diff line number Diff line
@@ -87,10 +87,6 @@ 
#include <openssl/x509.h>

#include <openssl/err.h>



#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";

crypto/bn/exptest.c

+0 −3
Original line number Diff line number Diff line
@@ -66,9 +66,6 @@ 
#include <openssl/bn.h>

#include <openssl/rand.h>

#include <openssl/err.h>

#ifdef OPENSSL_SYS_WINDOWS

#include "../bio/bss_file.c"

#endif



#define NUM_BITS	(BN_BITS*2)

crypto/dh/dhtest.c

+0 −7
Original line number Diff line number Diff line
@@ -68,9 +68,6 @@ 


#include "../e_os.h"



#ifdef OPENSSL_SYS_WINDOWS

#include "../bio/bss_file.c" 

#endif

#include <openssl/crypto.h>

#include <openssl/bio.h>

#include <openssl/bn.h>
@@ -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";