diff --git a/webrtc/base/openssladapter.cc b/webrtc/base/openssladapter.cc index 5caad17c67..56610fa240 100644 --- a/webrtc/base/openssladapter.cc +++ b/webrtc/base/openssladapter.cc @@ -74,7 +74,8 @@ static long socket_ctrl(BIO* h, int cmd, long arg1, void* arg2); static int socket_new(BIO* h); static int socket_free(BIO* data); -static const BIO_METHOD methods_socket = { +// TODO(davidben): This should be const once BoringSSL is assumed. +static BIO_METHOD methods_socket = { BIO_TYPE_BIO, "socket", socket_write, @@ -87,7 +88,7 @@ static const BIO_METHOD methods_socket = { NULL, }; -static const BIO_METHOD* BIO_s_socket2() { return(&methods_socket); } +static BIO_METHOD* BIO_s_socket2() { return(&methods_socket); } static BIO* BIO_new_socket(rtc::AsyncSocket* socket) { BIO* ret = BIO_new(BIO_s_socket2()); diff --git a/webrtc/base/opensslstreamadapter.cc b/webrtc/base/opensslstreamadapter.cc index c88ae04fc7..c18295f577 100644 --- a/webrtc/base/opensslstreamadapter.cc +++ b/webrtc/base/opensslstreamadapter.cc @@ -67,7 +67,8 @@ static long stream_ctrl(BIO* h, int cmd, long arg1, void* arg2); static int stream_new(BIO* h); static int stream_free(BIO* data); -static const BIO_METHOD methods_stream = { +// TODO(davidben): This should be const once BoringSSL is assumed. +static BIO_METHOD methods_stream = { BIO_TYPE_BIO, "stream", stream_write, @@ -80,7 +81,7 @@ static const BIO_METHOD methods_stream = { NULL, }; -static const BIO_METHOD* BIO_s_stream() { return(&methods_stream); } +static BIO_METHOD* BIO_s_stream() { return(&methods_stream); } static BIO* BIO_new_stream(StreamInterface* stream) { BIO* ret = BIO_new(BIO_s_stream());