summaryrefslogtreecommitdiffstats
path: root/Utilities/cmcurl/lib/vtls/vtls.c
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2018-10-31 13:46:23 (GMT)
committerBrad King <brad.king@kitware.com>2018-10-31 13:46:23 (GMT)
commit636bcefeab3b386e65efe03b199b9b2614d8a78d (patch)
tree7198834e3a8ff6ce1facc9d14efcd1160e7681bd /Utilities/cmcurl/lib/vtls/vtls.c
parent9c6574795c404417939c889d8cb45095c4175474 (diff)
parent9835e9075037db3d23ade0ef865c562b08cf6023 (diff)
downloadCMake-636bcefeab3b386e65efe03b199b9b2614d8a78d.zip
CMake-636bcefeab3b386e65efe03b199b9b2614d8a78d.tar.gz
CMake-636bcefeab3b386e65efe03b199b9b2614d8a78d.tar.bz2
Merge branch 'upstream-curl' into update-curl
* upstream-curl: curl 2018-10-30 (19667715)
Diffstat (limited to 'Utilities/cmcurl/lib/vtls/vtls.c')
-rw-r--r--Utilities/cmcurl/lib/vtls/vtls.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/Utilities/cmcurl/lib/vtls/vtls.c b/Utilities/cmcurl/lib/vtls/vtls.c
index b61c640..6af39fe 100644
--- a/Utilities/cmcurl/lib/vtls/vtls.c
+++ b/Utilities/cmcurl/lib/vtls/vtls.c
@@ -1190,6 +1190,8 @@ const struct Curl_ssl *Curl_ssl =
&Curl_ssl_polarssl;
#elif defined(USE_SCHANNEL)
&Curl_ssl_schannel;
+#elif defined(USE_MESALINK)
+ &Curl_ssl_mesalink;
#else
#error "Missing struct Curl_ssl for selected SSL backend"
#endif
@@ -1225,6 +1227,9 @@ static const struct Curl_ssl *available_backends[] = {
#if defined(USE_SCHANNEL)
&Curl_ssl_schannel,
#endif
+#if defined(USE_MESALINK)
+ &Curl_ssl_mesalink,
+#endif
NULL
};