diff options
| author | Andy Polyakov <appro@openssl.org> | 2005-08-03 19:56:36 +0000 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2005-08-03 19:56:36 +0000 |
| commit | 19bd66fe747e9768a684e26f24bae4445353ee6c (patch) | |
| tree | 915972b04847f81885f16009df7dac34728b4f9c /crypto | |
| parent | 45771abbd60007dc8c192b1e54b7e4dcdbcd60b9 (diff) | |
WCE update, mostly typos.
Diffstat (limited to 'crypto')
| -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 |
4 files changed, 8 insertions, 5 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 |