Commit db40a14e authored by Andy Polyakov's avatar Andy Polyakov
Browse files

Fix -Wshadow warnings in mingw builds. 



Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
parent 156561b0

apps/speed.c

+3 −3
Original line number Diff line number Diff line
@@ -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 */

crypto/rand/rand_win.c

+3 −3
Original line number Diff line number Diff line
@@ -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();