diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2019-03-19 10:19:40 +0100 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2019-03-19 10:19:40 +0100 |
| commit | 8452f624caf38f62ddb06b3c45f3eede71c8300d (patch) | |
| tree | 83d7669ca08074cd60324b589550d2bd3e84c106 | |
| parent | dc5edf912495b521bcd223ce7f54f8da6b7e0c14 (diff) | |
| download | curl-bagder/sectransp-tvos.tar.gz | |
sectransp: make it build on tvOS (== no ALPN support)bagder/sectransp-tvos
Reported-by: nianxuejie on github
Fixes #3689
| -rw-r--r-- | lib/vtls/sectransp.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/lib/vtls/sectransp.c b/lib/vtls/sectransp.c index 949bd236b..f477a51fc 100644 --- a/lib/vtls/sectransp.c +++ b/lib/vtls/sectransp.c @@ -108,6 +108,11 @@ #error "The Secure Transport back-end requires iOS or macOS." #endif /* (TARGET_OS_MAC && !(TARGET_OS_EMBEDDED || TARGET_OS_IPHONE)) */ +#if (CURL_BUILD_MAC_10_13 || CURL_BUILD_IOS_11) && \ + (HAVE_BUILTIN_AVAILABLE == 1) && !defined(TARGET_OS_TV) +#define SECTRANSP_HAS_ALPN +#endif + #if CURL_BUILD_MAC #include <sys/sysctl.h> #endif /* CURL_BUILD_MAC */ @@ -1575,7 +1580,7 @@ static CURLcode sectransp_connect_step1(struct connectdata *conn, } #endif /* CURL_BUILD_MAC_10_8 || CURL_BUILD_IOS */ -#if (CURL_BUILD_MAC_10_13 || CURL_BUILD_IOS_11) && HAVE_BUILTIN_AVAILABLE == 1 +#ifdef SECTRANSP_HAS_ALPN if(conn->bits.tls_enable_alpn) { if(__builtin_available(macOS 10.13.4, iOS 11, *)) { CFMutableArrayRef alpnArr = CFArrayCreateMutable(NULL, 0, @@ -2626,7 +2631,7 @@ sectransp_connect_step2(struct connectdata *conn, int sockindex) break; } -#if(CURL_BUILD_MAC_10_13 || CURL_BUILD_IOS_11) && HAVE_BUILTIN_AVAILABLE == 1 +#ifdef SECTRANSP_HAS_ALPN if(conn->bits.tls_enable_alpn) { if(__builtin_available(macOS 10.13.4, iOS 11, *)) { CFArrayRef alpnArr = NULL; |