diff options
| author | Bernhard Rosenkraenzer <bero@arklinux.ch> | 2009-09-09 11:40:51 (GMT) |
|---|---|---|
| committer | Peter Hartmann <peter.hartmann@trolltech.com> | 2009-09-09 11:40:51 (GMT) |
| commit | 67697199f0c9a9890b86d826e7193862aaad03b0 (patch) | |
| tree | 8f329ebd256b29e25f4ec478bfd4fb7b4dc15be6 /src | |
| parent | 306e7efd395ae6ebde7ee5832271ccceb4bead88 (diff) | |
| download | Qt-67697199f0c9a9890b86d826e7193862aaad03b0.zip Qt-67697199f0c9a9890b86d826e7193862aaad03b0.tar.gz Qt-67697199f0c9a9890b86d826e7193862aaad03b0.tar.bz2 | |
Fix build with openssl 1.0.0 betas
The recent addition of sk_pop_free to
src/network/ssl/qsslsocket_openssl_symbols.cpp
broke the build with openssl 1.0.0 betas; this commit fixes it
Merge-request: 1409
Reviewed-by: Peter Hartmann <peter.hartmann@trolltech.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/network/ssl/qsslsocket_openssl_symbols.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/network/ssl/qsslsocket_openssl_symbols.cpp b/src/network/ssl/qsslsocket_openssl_symbols.cpp index f23e217..e504b23 100644 --- a/src/network/ssl/qsslsocket_openssl_symbols.cpp +++ b/src/network/ssl/qsslsocket_openssl_symbols.cpp @@ -145,10 +145,11 @@ DEFINEFUNC(int, RAND_status, void, DUMMYARG, return -1, return) DEFINEFUNC(void, RSA_free, RSA *a, a, return, DUMMYARG) DEFINEFUNC(void, sk_free, STACK *a, a, return, DUMMYARG) DEFINEFUNC(int, sk_num, STACK *a, a, return -1, return) -DEFINEFUNC2(void, sk_pop_free, STACK *a, a, void (*b)(STACK*), b, return, DUMMYARG) #if OPENSSL_VERSION_NUMBER >= 0x10000000L +DEFINEFUNC2(void, sk_pop_free, STACK *a, a, void (*b)(void*), b, return, DUMMYARG) DEFINEFUNC2(void *, sk_value, STACK *a, a, int b, b, return 0, return) #else +DEFINEFUNC2(void, sk_pop_free, STACK *a, a, void (*b)(STACK*), b, return, DUMMYARG) DEFINEFUNC2(char *, sk_value, STACK *a, a, int b, b, return 0, return) #endif DEFINEFUNC(int, SSL_accept, SSL *a, a, return -1, return) |