[openssl] master update

[tmraz at fedoraproject.org]

The branch master has been updated
       via  c5b356d5d6cfca1128b35f235dfdb893f2888027 (commit)
      from  ebc1e8fc4ec2888fdb99d487c064d8ef586f3ee3 (commit)


- Log -----------------------------------------------------------------
commit c5b356d5d6cfca1128b35f235dfdb893f2888027
Author: Peter Eisentraut <peter at eisentraut.org>
Date:   Thu Jul 16 10:18:16 2020 +0200

    Mark an argument of an inline function as unused
    
    This allows users of this header file to compile their own code with
    the gcc option -Wunused-parameter.
    
    CLA: trivial
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    Reviewed-by: Shane Lontis <shane.lontis at oracle.com>
    Reviewed-by: Tomas Mraz <tmraz at fedoraproject.org>
    (Merged from https://github.com/openssl/openssl/pull/12459)

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

Summary of changes:
 include/openssl/err.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/openssl/err.h b/include/openssl/err.h
index fd3b93aa47..77bbba4f9f 100644
--- a/include/openssl/err.h
+++ b/include/openssl/err.h
@@ -221,7 +221,7 @@ static ossl_inline int ERR_GET_LIB(unsigned long errcode)
     return (errcode >> ERR_LIB_OFFSET) & ERR_LIB_MASK;
 }
 
-static ossl_inline int ERR_GET_FUNC(unsigned long errcode)
+static ossl_inline int ERR_GET_FUNC(unsigned long errcode ossl_unused)
 {
     return 0;
 }