From: Matt Caswell Date: Wed, 30 Mar 2016 09:59:32 +0000 (+0100) Subject: Fix build compilation failures X-Git-Tag: OpenSSL_1_1_0-pre5~197 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=0c767ddcbbbddf79ae61a4b307df0115ced0c110;p=oweals%2Fopenssl.git Fix build compilation failures BIO_f_linebuffer() is now built by default instead of just on VMS, but the prototype in the header was still only available on VMS. Reviewed-by: Rich Salz --- diff --git a/include/openssl/bio.h b/include/openssl/bio.h index 09aeea1840..a32c2d3886 100644 --- a/include/openssl/bio.h +++ b/include/openssl/bio.h @@ -631,9 +631,7 @@ const BIO_METHOD *BIO_s_bio(void); const BIO_METHOD *BIO_s_null(void); const BIO_METHOD *BIO_f_null(void); const BIO_METHOD *BIO_f_buffer(void); -# ifdef OPENSSL_SYS_VMS const BIO_METHOD *BIO_f_linebuffer(void); -# endif const BIO_METHOD *BIO_f_nbio_test(void); # ifndef OPENSSL_NO_DGRAM const BIO_METHOD *BIO_s_datagram(void); diff --git a/util/libcrypto.num b/util/libcrypto.num index e43c85466d..7e704d3c92 100644 --- a/util/libcrypto.num +++ b/util/libcrypto.num @@ -1385,7 +1385,7 @@ BN_free 1342 1_1_0 EXIST::FUNCTION: EVP_aes_128_cfb1 1343 1_1_0 EXIST::FUNCTION:AES EC_KEY_get0_group 1344 1_1_0 EXIST::FUNCTION:EC PEM_write_bio_CMS_stream 1345 1_1_0 EXIST::FUNCTION:CMS -BIO_f_linebuffer 1346 1_1_0 EXIST:VMS:FUNCTION: +BIO_f_linebuffer 1346 1_1_0 EXIST::FUNCTION: ASN1_item_d2i_bio 1347 1_1_0 EXIST::FUNCTION: ENGINE_get_flags 1348 1_1_0 EXIST::FUNCTION:ENGINE OCSP_resp_find 1349 1_1_0 EXIST::FUNCTION: