diff options
| -rw-r--r-- | crypto/cryptlib.c | 4 | ||||
| -rw-r--r-- | crypto/dso/dso_win32.c | 4 | ||||
| -rw-r--r-- | crypto/md2/md2test.c | 1 | ||||
| -rw-r--r-- | crypto/rand/rand_win.c | 4 | ||||
| -rw-r--r-- | ssl/ssltest.c | 1 | ||||
| -rw-r--r-- | util/pl/VC-32.pl | 11 |
6 files changed, 15 insertions, 10 deletions
diff --git a/crypto/cryptlib.c b/crypto/cryptlib.c index c6a7173ab0..315559c71c 100644 --- a/crypto/cryptlib.c +++ b/crypto/cryptlib.c @@ -669,9 +669,9 @@ void OPENSSL_showfatal (const char *fmta,...) { va_list ap; TCHAR buf[256]; const TCHAR *fmt; +#ifdef STD_ERROR_HANDLE /* what a dirty trick! */ HANDLE h; -#ifdef STD_ERROR_HANDLE /* what a dirty trick! */ if ((h=GetStdHandle(STD_ERROR_HANDLE)) != NULL && GetFileType(h)!=FILE_TYPE_UNKNOWN) { /* must be console application */ @@ -734,7 +734,7 @@ void OPENSSL_showfatal (const char *fmta,...) } else #endif - MessageBox (NULL,buf,_T("OpenSSL: FATAL"),MB_OK|MB_ICONSTOP|MB_TASKMODAL); + MessageBox (NULL,buf,_T("OpenSSL: FATAL"),MB_OK|MB_ICONSTOP); } #else void OPENSSL_showfatal (const char *fmta,...) diff --git a/crypto/dso/dso_win32.c b/crypto/dso/dso_win32.c index 9c94123105..d268c3e18d 100644 --- a/crypto/dso/dso_win32.c +++ b/crypto/dso/dso_win32.c @@ -86,13 +86,13 @@ static FARPROC GetProcAddressA(HMODULE hModule,LPCSTR lpProcName) # undef GetProcAddress # define GetProcAddress GetProcAddressA -static HINSTANCE LoadLibraryA(LPCSTR *lpLibFileName) +static HINSTANCE LoadLibraryA(LPCSTR lpLibFileName) { WCHAR *fnamw; size_t len_0=strlen(lpLibFileName)+1,i; #ifdef _MSC_VER - fname = (WCHAR *)_alloca (len_0*sizeof(WCHAR)); + fnamw = (WCHAR *)_alloca (len_0*sizeof(WCHAR)); #else fnamw = (WCHAR *)alloca (len_0*sizeof(WCHAR)); #endif diff --git a/crypto/md2/md2test.c b/crypto/md2/md2test.c index 21b381c351..db5f5bc6d2 100644 --- a/crypto/md2/md2test.c +++ b/crypto/md2/md2test.c @@ -128,6 +128,7 @@ int main(int argc, char *argv[]) if (err) printf("ERROR: %d\n", err); #endif EXIT(err); + return err; } static char *pt(unsigned char *md) diff --git a/crypto/rand/rand_win.c b/crypto/rand/rand_win.c index 02cce34170..3851d85bcc 100644 --- a/crypto/rand/rand_win.c +++ b/crypto/rand/rand_win.c @@ -205,7 +205,9 @@ int RAND_poll(void) GetVersionEx( &osverinfo ) ; #if defined(OPENSSL_SYS_WINCE) -# if defined(_WIN32_WCE) && _WIN32_WCE>=210 +# if defined(_WIN32_WCE) && _WIN32_WCE>=300 +/* Even though MSDN says _WIN32_WCE>=210, it doesn't seem to be available + * in commonly available implementations prior 300... */ # ifndef CryptAcquireContext /* reserve for broken header... */ # define CryptAcquireContext CryptAcquireContextW diff --git a/ssl/ssltest.c b/ssl/ssltest.c index 6949f9696b..8c04e7434d 100644 --- a/ssl/ssltest.c +++ b/ssl/ssltest.c @@ -893,6 +893,7 @@ end: CRYPTO_mem_leaks(bio_err); if (bio_err != NULL) BIO_free(bio_err); EXIT(ret); + return ret; } int doit_biopair(SSL *s_ssl, SSL *c_ssl, long count, diff --git a/util/pl/VC-32.pl b/util/pl/VC-32.pl index 096f607c70..bc9003135f 100644 --- a/util/pl/VC-32.pl +++ b/util/pl/VC-32.pl @@ -48,15 +48,15 @@ elsif ($FLAVOR =~ /CE/) $wcetgt = $ENV{'TARGETCPU'}; # just shorter name... SWITCH: for($wcetgt) { /^X86/ && do { $wcecdefs.=" -Dx86 -D_X86_"; - $wcelflag.=" /machine:X86"; last; } + $wcelflag.=" /machine:X86"; last; }; /^ARM/ && do { $wcecdefs.=" -DARM -D_ARM_"; - $wcelflag.=" /machine:$wcetgt"; last; } + $wcelflag.=" /machine:$wcetgt"; last; }; /^R4[0-9]{3}/ && do { $wcecdefs.=" -DMIPS -D_MIPS_ -DMIPS_R4000"; - $wcelflag.=" /machine:$wcetgt"; last; } + $wcelflag.=" /machine:MIPS"; last; }; /^SH[0-9]/ && do { $wcecdefs.=" -D$wcetgt -D_$wcetgt_ -DSHx"; - $wcelflag.=" /machine:$wcetgt"; last; } + $wcelflag.=" /machine:$wcetgt"; last; }; { $wcecdefs.=" -D$wcetgt -D_$wcetgt_"; - $wcelflag.=" /machine:$wcetgt"; last; } + $wcelflag.=" /machine:$wcetgt"; last; }; } $cc='$(CC)'; @@ -64,6 +64,7 @@ elsif ($FLAVOR =~ /CE/) $base_cflags.=" $wcecdefs"; $base_cflags.=" -Qsh4" if ($wcetgt =~ /^SH4/); $opt_cflags=' /MC /O1i'; # optimize for space, but with intrinsics... + $opt_cflags.=' /wd4959'; # disable "too large to optimize" warning... $dbg_clfags=' /MC /Od -DDEBUG -D_DEBUG'; $lflags="/nologo /opt:ref $wcelflag"; } |