Gijs Vermeulen : secur32: Default to building with GnuTLS support on macOS, if present.
Module: wine Branch: master Commit: 4940d2ada276a5c6e9f855177ef54ce23490d36e URL: https://source.winehq.org/git/wine.git/?a=commit;h=4940d2ada276a5c6e9f855177... Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Thu Jun 17 22:46:29 2021 +0200 secur32: Default to building with GnuTLS support on macOS, if present. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/schannel_gnutls.c | 4 ++-- dlls/secur32/schannel_macosx.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index 93868d10b3b..03124924644 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -47,7 +47,7 @@ #include "wine/debug.h" #include "wine/unicode.h" -#if defined(SONAME_LIBGNUTLS) && !defined(HAVE_SECURITY_SECURITY_H) +#if defined(SONAME_LIBGNUTLS) WINE_DEFAULT_DEBUG_CHANNEL(secur32); WINE_DECLARE_DEBUG_CHANNEL(winediag); @@ -1122,4 +1122,4 @@ NTSTATUS CDECL __wine_init_unix_lib( HMODULE module, DWORD reason, const void *p return STATUS_SUCCESS; } -#endif /* SONAME_LIBGNUTLS && !HAVE_SECURITY_SECURITY_H */ +#endif /* SONAME_LIBGNUTLS */ diff --git a/dlls/secur32/schannel_macosx.c b/dlls/secur32/schannel_macosx.c index f4f84557dfe..d7453a44816 100644 --- a/dlls/secur32/schannel_macosx.c +++ b/dlls/secur32/schannel_macosx.c @@ -47,7 +47,7 @@ #include "secur32_priv.h" #include "wine/debug.h" -#ifdef HAVE_SECURITY_SECURITY_H +#if defined(HAVE_SECURITY_SECURITY_H) && !defined(SONAME_LIBGNUTLS) WINE_DEFAULT_DEBUG_CHANNEL(secur32); @@ -1290,4 +1290,4 @@ NTSTATUS CDECL __wine_init_unix_lib( HMODULE module, DWORD reason, const void *p return STATUS_SUCCESS; } -#endif /* HAVE_SECURITY_SECURITY_H */ +#endif /* HAVE_SECURITY_SECURITY_H && !SONAME_LIBGNUTLS */
participants (1)
-
Alexandre Julliard