From 79c4864a563824b19044ef98599f0ccdad262e84 Mon Sep 17 00:00:00 2001
From: Jan-E <github@ehrhardt.nl>
Date: Fri, 12 Apr 2019 23:41:13 +0200
Subject: winbuild: Support MultiSSL builds

- Remove the lines in winbuild/Makefile.vc that generate an error with
  multiple SSL backends.

- Add /DCURL_WITH_MULTI_SSL in winbuild/MakefileBuild.vc if multiple SSL
  backends are set.

Closes https://github.com/curl/curl/pull/3772
---
 winbuild/Makefile.vc      | 6 ------
 winbuild/MakefileBuild.vc | 6 ++++++
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/winbuild/Makefile.vc b/winbuild/Makefile.vc
index 94ce8db36..26ab90693 100644
--- a/winbuild/Makefile.vc
+++ b/winbuild/Makefile.vc
@@ -168,12 +168,6 @@ USE_MBEDTLS = true
 MBEDTLS     = $(WITH_MBEDTLS)
 !ENDIF
 
-!IF ( "$(USE_SSL)"=="true" && "$(USE_WINSSL)"=="true" ) \
- || ( "$(USE_SSL)"=="true" && "$(USE_MBEDTLS)"=="true" ) \
- || ( "$(USE_MBEDTLS)"=="true" && "$(USE_WINSSL)"=="true" )
-!ERROR SSL, MBEDTLS and WINSSL are mutual exclusive options.
-!ENDIF
-
 !IF "$(WITH_CARES)"=="dll"
 USE_CARES = true
 CARES     = dll
diff --git a/winbuild/MakefileBuild.vc b/winbuild/MakefileBuild.vc
index 3125c21b8..8d942b759 100644
--- a/winbuild/MakefileBuild.vc
+++ b/winbuild/MakefileBuild.vc
@@ -479,6 +479,12 @@ CFLAGS = $(CFLAGS) $(CFLAGS_PDB) /Fd"$(LIB_DIROBJ)\$(PDB)"
 LFLAGS = $(LFLAGS) $(LFLAGS_PDB)
 !ENDIF
 
+!IF ( "$(USE_SSL)"=="true" && "$(USE_WINSSL)"=="true" ) \
+ || ( "$(USE_SSL)"=="true" && "$(USE_MBEDTLS)"=="true" ) \
+ || ( "$(USE_MBEDTLS)"=="true" && "$(USE_WINSSL)"=="true" )
+CFLAGS = $(CFLAGS) /DCURL_WITH_MULTI_SSL
+!ENDIF
+
 LIB_DIROBJ = ..\builds\$(CONFIG_NAME_LIB)-obj-lib
 CURL_DIROBJ = ..\builds\$(CONFIG_NAME_LIB)-obj-curl
 DIRDIST = ..\builds\$(CONFIG_NAME_LIB)\
-- 
cgit v1.2.3