Skip to content

W
wine-winehq
Commit 53391a34 authored by Uwe Bonnes's avatar Uwe Bonnes Committed by Alexandre Julliard
Browse files
Options

wininet: Add const qualifier after openssl version check.

parent 1510698b
Show whitespace changes
Inline Side-by-side
Showing with 10 additions and 0 deletions
dlls/winhttp/net.c
View file @ 53391a34
...@@ -38,6 +38,7 @@ ...@@ -38,6 +38,7 @@
#endif #endif
#ifdef HAVE_OPENSSL_SSL_H #ifdef HAVE_OPENSSL_SSL_H
# include <openssl/ssl.h> # include <openssl/ssl.h>
# include <openssl/opensslv.h>
#undef FAR #undef FAR
#undef DSA #undef DSA
#endif #endif
...@@ -91,7 +92,11 @@ static CRITICAL_SECTION init_ssl_cs = { &init_ssl_cs_debug, -1, 0, 0, 0, 0 }; ...@@ -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 *libssl_handle;
static void *libcrypto_handle; static void *libcrypto_handle;
#if defined(OPENSSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER> 0x1000000)
static const SSL_METHOD *method;
#else
static SSL_METHOD *method; static SSL_METHOD *method;
#endif
static SSL_CTX *ctx; static SSL_CTX *ctx;
static int hostname_idx; static int hostname_idx;
static int error_idx; static int error_idx;
......
dlls/wininet/netconnection.c
View file @ 53391a34
...@@ -60,6 +60,7 @@ ...@@ -60,6 +60,7 @@
#endif #endif
#ifdef HAVE_OPENSSL_SSL_H #ifdef HAVE_OPENSSL_SSL_H
# include <openssl/ssl.h> # include <openssl/ssl.h>
# include <openssl/opensslv.h>
#undef FAR #undef FAR
#undef DSA #undef DSA
#endif #endif
...@@ -113,7 +114,11 @@ static CRITICAL_SECTION init_ssl_cs = { &init_ssl_cs_debug, -1, 0, 0, 0, 0 }; ...@@ -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_ssl_handle;
static void *OpenSSL_crypto_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; static SSL_METHOD *meth;
#endif
static SSL_CTX *ctx; static SSL_CTX *ctx;
static int hostname_idx; static int hostname_idx;
static int error_idx; static int error_idx;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment