From: Andy Polyakov <appro@openssl.org>
Date: Mon, 28 Sep 2015 14:05:32 +0000 (+0200)
Subject: Fix -Wshadow warnings in mingw builds.
X-Git-Tag: OpenSSL_1_1_0-pre1~489
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=db40a14ecbb2f65bb3a86505f53db00633347f3b;p=openssl

Fix -Wshadow warnings in mingw builds.

Reviewed-by: Rich Salz <rsalz@openssl.org>
---

diff --git a/apps/speed.c b/apps/speed.c
index 4b53f61a2c..046c0b2614 100644
--- a/apps/speed.c
+++ b/apps/speed.c
@@ -297,9 +297,9 @@ static double Time_F(int s)
         schlock = 0;
         thr = CreateThread(NULL, 4096, sleepy, NULL, 0, NULL);
         if (thr == NULL) {
-            DWORD ret = GetLastError();
-            BIO_printf(bio_err, "unable to CreateThread (%d)", ret);
-            ExitProcess(ret);
+            DWORD err = GetLastError();
+            BIO_printf(bio_err, "unable to CreateThread (%lu)", err);
+            ExitProcess(err);
         }
         while (!schlock)
             Sleep(0);           /* scheduler spinlock */
diff --git a/crypto/rand/rand_win.c b/crypto/rand/rand_win.c
index e926429e7f..a91014bad3 100644
--- a/crypto/rand/rand_win.c
+++ b/crypto/rand/rand_win.c
@@ -196,7 +196,7 @@ typedef NET_API_STATUS(NET_API_FUNCTION *NETFREE) (LPBYTE);
 
 int RAND_poll(void)
 {
-    MEMORYSTATUS m;
+    MEMORYSTATUS mst;
     HCRYPTPROV hProvider = 0;
     DWORD w;
     int good = 0;
@@ -558,8 +558,8 @@ int RAND_poll(void)
     readtimer();
 
     /* memory usage statistics */
-    GlobalMemoryStatus(&m);
-    RAND_add(&m, sizeof(m), 1);
+    GlobalMemoryStatus(&mst);
+    RAND_add(&mst, sizeof(mst), 1);
 
     /* process ID */
     w = GetCurrentProcessId();