[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  e0de4dd5a2b0c0dc27e6a6ab01fabe374d657d23 (commit)
      from  386e9169c35718436ba038dff93711d2db73fa6a (commit)


- Log -----------------------------------------------------------------
commit e0de4dd5a2b0c0dc27e6a6ab01fabe374d657d23
Author: Xiaoyin Liu <xiaoyinl at users.noreply.github.com>
Date:   Mon Jul 24 11:28:50 2017 -0400

    schlock global variable needs to be volatile
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/4000)

-----------------------------------------------------------------------

Summary of changes:
 apps/speed.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/speed.c b/apps/speed.c
index becdf6e..2d943b1 100644
--- a/apps/speed.c
+++ b/apps/speed.c
@@ -275,7 +275,8 @@ static SIGRETTYPE sig_done(int sig)
 # if !defined(SIGALRM)
 #  define SIGALRM
 # endif
-static unsigned int lapse, schlock;
+static unsigned int lapse;
+static volatile unsigned int schlock;
 static void alarm_win32(unsigned int secs)
 {
     lapse = secs * 1000;