Make it compile with openssl 1.0.0d, gcc 4.6
authorBernhard Rosenkraenzer <bero@arklinux.ch>
Mon, 27 Jun 2011 16:12:46 +0000 (18:12 +0200)
committerQt by Nokia <qt-info@nokia.com>
Tue, 28 Jun 2011 08:09:00 +0000 (10:09 +0200)
commit563ec6c690e29d5efb24d0b63ac6c2e80a673db1
tree23eaa5cee9ba05455582ea4b65d18c469bb645b6
parent6fa15d7a91dbd7c1627e3481387437ddf2b09122
Make it compile with openssl 1.0.0d, gcc 4.6

SSL_ctrl's prototype has changed slightly in openssl 1.0.0x - the 4th
argument is now a void* as opposed to a const void*.
gcc 4.6 doesn't allow this as an implicit cast.

Merge-request: 1239
Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
(cherry picked from commit 007f01a7e801d5409708e4b8de8b3ead1481cf7d)

Change-Id: I4f41af981cf0762383b3fc867ec5d726e2b1e5c6
Reviewed-on: http://codereview.qt.nokia.com/821
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
src/network/ssl/qsslsocket_openssl.cpp
src/network/ssl/qsslsocket_openssl_symbols.cpp
src/network/ssl/qsslsocket_openssl_symbols_p.h