diff options
| author | Matt Caswell <matt@openssl.org> | 2020-10-29 12:46:28 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2020-10-30 14:24:30 +0000 |
| commit | e82f45982cf1660d3287332d3d70bf5b01de1fd1 (patch) | |
| tree | a9b1f6319de48aa25290a483b771f618c88d7bd4 /include | |
| parent | 140eee2b3b3090107aea2d09ab10eb737fb1e5bb (diff) | |
Fix some missed usage of DEFINE_LHASH_OF()
PR#12860 fixed issues with the Lhash code. It replaced usage of
DEFINE_LHASH_OF() in the public headers. Unfortunately it missed a couple
of instances.
Reviewed-by: Paul Dale <paul.dale@oracle.com>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/13274)
Diffstat (limited to 'include')
| -rw-r--r-- | include/openssl/lhash.h.in (renamed from include/openssl/lhash.h) | 23 |
1 files changed, 8 insertions, 15 deletions
diff --git a/include/openssl/lhash.h b/include/openssl/lhash.h.in index ccdd3a60ee..571dce43ea 100644 --- a/include/openssl/lhash.h +++ b/include/openssl/lhash.h.in @@ -7,6 +7,10 @@ * https://www.openssl.org/source/license.html */ +{- +use OpenSSL::stackhash qw(generate_lhash_macros); +-} + /* * Header for dynamic hash table routines Author - Eric Young */ @@ -240,21 +244,10 @@ void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *lh, BIO *out); } \ LHASH_OF(type) -DEFINE_LHASH_OF(OPENSSL_STRING); -# ifdef _MSC_VER -/* - * push and pop this warning: - * warning C4090: 'function': different 'const' qualifiers - */ -# pragma warning (push) -# pragma warning (disable: 4090) -# endif - -DEFINE_LHASH_OF(OPENSSL_CSTRING); - -# ifdef _MSC_VER -# pragma warning (pop) -# endif +{- + generate_lhash_macros("OPENSSL_STRING") + .generate_lhash_macros("OPENSSL_CSTRING"); +-} #ifdef __cplusplus } |