diff options
| author | Fabrice Fontaine <fontaine.fabrice@gmail.com> | 2023-02-21 14:20:11 +0100 |
|---|---|---|
| committer | Fabrice Fontaine <fontaine.fabrice@gmail.com> | 2023-02-21 14:42:13 +0100 |
| commit | c5b4f7009b47eac331fb5d20d53366fc99abecf0 (patch) | |
| tree | ea3d2222e4389723dd643f601595da15309eb5f9 | |
| parent | 54406e2ff1e39a3245d04253648153d5f4751938 (diff) | |
| download | ATCD-c5b4f7009b47eac331fb5d20d53366fc99abecf0.tar.gz | |
ACE/ace/SSL/SSL_Asynch_BIO.cpp: fix build with libressl >= 3.5.0
Fix the following build failure with libressl >= 3.5.0:
/tmp/instance-17/output-1/build/ace-7.0.6/ace/SSL/SSL_Asynch_BIO.cpp:45:19: error: variable 'BIO_METHOD methods_ACE' has initializer but incomplete type
45 | static BIO_METHOD methods_ACE =
| ^~~~~~~~~~~
Fixes:
- http://autobuild.buildroot.org/results/7f40d6dde03134238151c248fbbd66e4713546cb
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
| -rw-r--r-- | ACE/ace/SSL/SSL_Asynch_BIO.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ACE/ace/SSL/SSL_Asynch_BIO.cpp b/ACE/ace/SSL/SSL_Asynch_BIO.cpp index 0faa775fc0f..0317ccbd12c 100644 --- a/ACE/ace/SSL/SSL_Asynch_BIO.cpp +++ b/ACE/ace/SSL/SSL_Asynch_BIO.cpp @@ -41,7 +41,7 @@ extern "C" #define BIO_TYPE_ACE ( 21 | BIO_TYPE_SOURCE_SINK ) -#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) +#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x30500000L) static BIO_METHOD methods_ACE = { BIO_TYPE_ACE, // BIO_TYPE_PROXY_SERVER, @@ -68,14 +68,14 @@ static BIO_METHOD methods_ACE = #else static BIO_METHOD* methods_ACE; # define BIO_set_num(b, val) -#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) */ +#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x30500000L) */ ACE_BEGIN_VERSIONED_NAMESPACE_DECL BIO * ACE_SSL_make_BIO (void * ssl_asynch_stream) { -#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) +#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x30500000L) BIO * const pBIO = BIO_new (&methods_ACE); #else if (!methods_ACE) |