Module: wine Branch: master Commit: 53391a344546b3e71a302ae2985b03f73756ad4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=53391a344546b3e71a302ae298...
Author: Uwe Bonnes bon@elektron.ikp.physik.tu-darmstadt.de Date: Mon Jul 26 18:41:00 2010 +0200
wininet: Add const qualifier after openssl version check.
---
dlls/winhttp/net.c | 5 +++++ dlls/wininet/netconnection.c | 5 +++++ 2 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index e60bd16..573f108 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -38,6 +38,7 @@ #endif #ifdef HAVE_OPENSSL_SSL_H # include <openssl/ssl.h> +# include <openssl/opensslv.h> #undef FAR #undef DSA #endif @@ -91,7 +92,11 @@ static CRITICAL_SECTION init_ssl_cs = { &init_ssl_cs_debug, -1, 0, 0, 0, 0 }; static void *libssl_handle; static void *libcrypto_handle;
+#if defined(OPENSSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER> 0x1000000) +static const SSL_METHOD *method; +#else static SSL_METHOD *method; +#endif static SSL_CTX *ctx; static int hostname_idx; static int error_idx; diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index abd7415..54ca51b 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -60,6 +60,7 @@ #endif #ifdef HAVE_OPENSSL_SSL_H # include <openssl/ssl.h> +# include <openssl/opensslv.h> #undef FAR #undef DSA #endif @@ -113,7 +114,11 @@ static CRITICAL_SECTION init_ssl_cs = { &init_ssl_cs_debug, -1, 0, 0, 0, 0 }; static void *OpenSSL_ssl_handle; static void *OpenSSL_crypto_handle;
+#if defined(OPENSSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER> 0x1000000) +static const SSL_METHOD *meth; +#else static SSL_METHOD *meth; +#endif static SSL_CTX *ctx; static int hostname_idx; static int error_idx;