1 files changed, 9 insertions, 13 deletions
diff --git a/boost/asio/ssl/detail/engine.hpp b/boost/asio/ssl/detail/engine.hpp
index f31a4a7287..bcd516dc49 100644
--- a/boost/asio/ssl/detail/engine.hpp
+++ b/boost/asio/ssl/detail/engine.hpp
@@ -17,14 +17,12 @@
 
 #include <boost/asio/detail/config.hpp>
 
-#if !defined(BOOST_ASIO_ENABLE_OLD_SSL)
-# include <boost/asio/buffer.hpp>
-# include <boost/asio/detail/static_mutex.hpp>
-# include <boost/asio/ssl/detail/openssl_types.hpp>
-# include <boost/asio/ssl/detail/verify_callback.hpp>
-# include <boost/asio/ssl/stream_base.hpp>
-# include <boost/asio/ssl/verify_mode.hpp>
-#endif // !defined(BOOST_ASIO_ENABLE_OLD_SSL)
+#include <boost/asio/buffer.hpp>
+#include <boost/asio/detail/static_mutex.hpp>
+#include <boost/asio/ssl/detail/openssl_types.hpp>
+#include <boost/asio/ssl/detail/verify_callback.hpp>
+#include <boost/asio/ssl/stream_base.hpp>
+#include <boost/asio/ssl/verify_mode.hpp>
 
 #include <boost/asio/detail/push_options.hpp>
 
@@ -33,8 +31,6 @@ namespace asio {
 namespace ssl {
 namespace detail {
 
-#if !defined(BOOST_ASIO_ENABLE_OLD_SSL)
-
 class engine
 {
 public:
@@ -98,7 +94,7 @@ public:
       boost::system::error_code& ec, std::size_t& bytes_transferred);
 
   // Get output data to be written to the transport.
-  BOOST_ASIO_DECL boost::asio::mutable_buffers_1 get_output(
+  BOOST_ASIO_DECL boost::asio::mutable_buffer get_output(
       const boost::asio::mutable_buffer& data);
 
   // Put input data that was read from the transport.
@@ -120,9 +116,11 @@ private:
   BOOST_ASIO_DECL static int verify_callback_function(
       int preverified, X509_STORE_CTX* ctx);
 
+#if (OPENSSL_VERSION_NUMBER < 0x10000000L)
   // The SSL_accept function may not be thread safe. This mutex is used to
   // protect all calls to the SSL_accept function.
   BOOST_ASIO_DECL static boost::asio::detail::static_mutex& accept_mutex();
+#endif // (OPENSSL_VERSION_NUMBER < 0x10000000L)
 
   // Perform one operation. Returns >= 0 on success or error, want_read if the
   // operation needs more input, or want_write if it needs to write some output
@@ -150,8 +148,6 @@ private:
   BIO* ext_bio_;
 };
 
-#endif // !defined(BOOST_ASIO_ENABLE_OLD_SSL)
-
 } // namespace detail
 } // namespace ssl
 } // namespace asio