[openssl-commits] [openssl] master update

[bernd.edlinger at hotmail.de]

The branch master has been updated
       via  0e0f8116e247912f5c48f8b3786e543f37fc1f87 (commit)
      from  eb2b9892065cf5b69400b98ca82e4e99a525eb29 (commit)


- Log -----------------------------------------------------------------
commit 0e0f8116e247912f5c48f8b3786e543f37fc1f87
Author: Bernd Edlinger <bernd.edlinger at hotmail.de>
Date:   Thu Apr 19 20:56:46 2018 +0200

    Fix building linux-armv4 with --strict-warnings
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/6026)

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

Summary of changes:
 crypto/arm_arch.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crypto/arm_arch.h b/crypto/arm_arch.h
index 547ec95..f11b543 100644
--- a/crypto/arm_arch.h
+++ b/crypto/arm_arch.h
@@ -69,7 +69,7 @@
 #  endif
 # endif
 
-# if !__ASSEMBLER__
+# ifndef __ASSEMBLER__
 extern unsigned int OPENSSL_armcap_P;
 # endif