The branch master has been updated
via 7b6a746721170a21519c38798041be8101e7361f (commit)
from 96fc458a9cbeb8e7b30d789ea5919c5dcb9b980e (commit)
- Log -----------------------------------------------------------------
commit 7b6a746721170a21519c38798041be8101e7361f
Author: Davide Galassi <da...@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 <levi...@openssl.org>
Reviewed-by: Paul Dale <paul.d...@oracle.com>
Reviewed-by: Matthias St. Pierre <matthias.st.pie...@ncp-e.com>
(Merged from https://github.com/openssl/openssl/pull/10946)
-----------------------------------------------------------------------
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 b1b5aa550a..2be4cf4236 100644
--- a/include/openssl/lhash.h
+++ b/include/openssl/lhash.h
@@ -127,9 +127,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); \
