summaryrefslogtreecommitdiffstats
path: root/src/network/ssl/qsslsocket_openssl_p.h
diff options
context:
space:
mode:
authorBernhard Rosenkraenzer <br@blankpage.ch>2009-06-05 10:18:11 (GMT)
committerThiago Macieira <thiago.macieira@nokia.com>2009-06-09 07:05:51 (GMT)
commit67b3981e249db9c7c570ff9f77a867ca4c8b0dca (patch)
tree165d0ec2ccc7f7efb6e409ccdffd9de82f9af6eb /src/network/ssl/qsslsocket_openssl_p.h
parentbbc0850742f4f926876dc55478ff74aaa121846b (diff)
downloadQt-67b3981e249db9c7c570ff9f77a867ca4c8b0dca.zip
Qt-67b3981e249db9c7c570ff9f77a867ca4c8b0dca.tar.gz
Qt-67b3981e249db9c7c570ff9f77a867ca4c8b0dca.tar.bz2
Make it possible to compile Qt 4.5 SSL support with OpenSSL 1.0.0
(-beta2, but 1.0.0 final shouldn't be very different) Merge-request: 449 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
Diffstat (limited to 'src/network/ssl/qsslsocket_openssl_p.h')
-rw-r--r--src/network/ssl/qsslsocket_openssl_p.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/network/ssl/qsslsocket_openssl_p.h b/src/network/ssl/qsslsocket_openssl_p.h
index b3be42a..feab1c2 100644
--- a/src/network/ssl/qsslsocket_openssl_p.h
+++ b/src/network/ssl/qsslsocket_openssl_p.h
@@ -78,6 +78,10 @@
#include <openssl/x509v3.h>
#include <openssl/x509_vfy.h>
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+typedef _STACK STACK;
+#endif
+
QT_BEGIN_NAMESPACE
class QSslSocketBackendPrivate : public QSslSocketPrivate