[openssl] OpenSSL_1_1_1-stable update

[matthias.st.pierre at ncp-e.com]

The branch OpenSSL_1_1_1-stable has been updated
       via  b04c8c06a63e90f8e3e1b7bbb338a49b678e86e7 (commit)
      from  6b9c86c471dcec61cfa836a4795aae3dd00c6827 (commit)


- Log -----------------------------------------------------------------
commit b04c8c06a63e90f8e3e1b7bbb338a49b678e86e7
Author: Davide Galassi <davxy at datawok.net>
Date:   Sat Jan 25 12:56:44 2020 +0100

    Prevent compiler warning for unused static function.
    
    Prepend missing ossl_unused in front of lh_type_new to make the compiler
    happy.
    
    CLA: trivial
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Paul Dale <paul.dale at oracle.com>
    Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre at ncp-e.com>
    (Merged from https://github.com/openssl/openssl/pull/10946)
    
    (cherry picked from commit 7b6a746721170a21519c38798041be8101e7361f)

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

Summary of changes:
 include/openssl/lhash.h | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/include/openssl/lhash.h b/include/openssl/lhash.h
index 47b99d17fb..1ffb56b527 100644
--- a/include/openssl/lhash.h
+++ b/include/openssl/lhash.h
@@ -120,9 +120,8 @@ void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *lh, BIO *out);
 
 # define DEFINE_LHASH_OF(type) \
     LHASH_OF(type) { union lh_##type##_dummy { void* d1; unsigned long d2; int d3; } dummy; }; \
-    static ossl_inline LHASH_OF(type) * \
-        lh_##type##_new(unsigned long (*hfn)(const type *), \
-                        int (*cfn)(const type *, const type *)) \
+    static ossl_unused ossl_inline LHASH_OF(type) *lh_##type##_new(unsigned long (*hfn)(const type *), \
+                                                                   int (*cfn)(const type *, const type *)) \
     { \
         return (LHASH_OF(type) *) \
             OPENSSL_LH_new((OPENSSL_LH_HASHFUNC)hfn, (OPENSSL_LH_COMPFUNC)cfn); \