The branch master has been updated
via 0c767ddcbbbddf79ae61a4b307df0115ced0c110 (commit)
from 84af71a916d0bfce4dde135e4a5fe60d75f4940c (commit)
- Log -----------------------------------------------------------------
commit 0c767ddcbbbddf79ae61a4b307df0115ced0c110
Author: Matt Caswell <[email protected]>
Date: Wed Mar 30 10:59:32 2016 +0100
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 <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
include/openssl/bio.h | 2 --
util/libcrypto.num | 2 +-
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/include/openssl/bio.h b/include/openssl/bio.h
index 09aeea1..a32c2d3 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 e43c854..7e704d3 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:
_____
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
