diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2010-11-19 00:12:01 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2010-11-19 00:12:01 +0000 |
| commit | e322fa2872762b33c2574cf8b33446e522a70da7 (patch) | |
| tree | e9baec759cbe63cad21839d935e71452c292ceec | |
| parent | 9ac0708f37ed5d06878736af0575a89912966e60 (diff) | |
| download | openssl-e322fa2872762b33c2574cf8b33446e522a70da7.tar.gz | |
PR: 2376
Submitted by: Guenter <lists@gknw.net>
Reviewed by: steve
Cleanup alloca use, fix Win32 target for OpenWatcom.
| -rw-r--r-- | crypto/cryptlib.c | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/crypto/cryptlib.c b/crypto/cryptlib.c index af1dbfb81d..f896c23fe6 100644 --- a/crypto/cryptlib.c +++ b/crypto/cryptlib.c @@ -756,6 +756,16 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, #if defined(_WIN32) && !defined(__CYGWIN__) #include <tchar.h> #include <signal.h> +#ifdef __WATCOMC__ +#if defined(_UNICODE) || defined(__UNICODE__) +#define _vsntprintf _vsnwprintf +#else +#define _vsntprintf _vsnprintf +#endif +#endif +#ifdef _MSC_VER +#define alloca _alloca +#endif #if defined(_WIN32_WINNT) && _WIN32_WINNT>=0x0333 int OPENSSL_isservice(void) @@ -786,11 +796,7 @@ int OPENSSL_isservice(void) if (len>512) return -1; /* paranoia */ len++,len&=~1; /* paranoia */ -#ifdef _MSC_VER - name=(WCHAR *)_alloca(len+sizeof(WCHAR)); -#else name=(WCHAR *)alloca(len+sizeof(WCHAR)); -#endif if (!GetUserObjectInformationW (h,UOI_NAME,name,len,&len)) return -1; @@ -835,11 +841,7 @@ void OPENSSL_showfatal (const char *fmta,...) size_t len_0=strlen(fmta)+1,i; WCHAR *fmtw; -#ifdef _MSC_VER - fmtw = (WCHAR *)_alloca (len_0*sizeof(WCHAR)); -#else - fmtw = (WCHAR *)alloca (len_0*sizeof(WCHAR)); -#endif + fmtw = (WCHAR *)alloca(len_0*sizeof(WCHAR)); if (fmtw == NULL) { fmt=(const TCHAR *)L"no stack?"; break; } #ifndef OPENSSL_NO_MULTIBYTE |