generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix -Wshadow warnings in mingw builds.

Browse Source 
Reviewed-by: Rich Salz <rsalz@openssl.org>
This commit is contained in:
Andy Polyakov 2015-09-28 16:05:32 +02:00
parent 156561b0ad
commit db40a14ecb
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/speed.c
View File

@ -297,9 +297,9 @@ static double Time_F(int s)
schlock = 0; schlock = 0;
thr = CreateThread(NULL, 4096, sleepy, NULL, 0, NULL); thr = CreateThread(NULL, 4096, sleepy, NULL, 0, NULL);
if (thr == NULL) { if (thr == NULL) {
DWORD ret = GetLastError(); DWORD err = GetLastError();
BIO_printf(bio_err, "unable to CreateThread (%d)", ret); BIO_printf(bio_err, "unable to CreateThread (%lu)", err);
ExitProcess(ret); ExitProcess(err);
} }
while (!schlock) while (!schlock)
Sleep(0); /* scheduler spinlock */ Sleep(0); /* scheduler spinlock */

6
crypto/rand/rand_win.c
View File

@ -196,7 +196,7 @@ typedef NET_API_STATUS(NET_API_FUNCTION *NETFREE) (LPBYTE);
int RAND_poll(void) int RAND_poll(void)
{ {
MEMORYSTATUS m; MEMORYSTATUS mst;
HCRYPTPROV hProvider = 0; HCRYPTPROV hProvider = 0;
DWORD w; DWORD w;
int good = 0; int good = 0;
@ -558,8 +558,8 @@ int RAND_poll(void)
readtimer(); readtimer();
/* memory usage statistics */ /* memory usage statistics */
GlobalMemoryStatus(&m); GlobalMemoryStatus(&mst);
RAND_add(&m, sizeof(m), 1); RAND_add(&mst, sizeof(mst), 1);
/* process ID */ /* process ID */
w = GetCurrentProcessId(); w = GetCurrentProcessId();