From d7914f75aa8ecdd68cdbb130c1351a7432597fe4 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Fri, 25 Apr 2025 18:26:10 +0200 Subject: [PATCH] sectransp: fix building for macOS Sierra and older Reported-by: Eric Knibbe Bug: https://github.com/curl/curl/pull/16581#issuecomment-2830837500 Regression from 2d94439eaa8da4fe11f99872a8b44087f74f88b0 #16581 Closes #17193 --- lib/vtls/sectransp.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/vtls/sectransp.c b/lib/vtls/sectransp.c index f0094df584..3e491adf37 100644 --- a/lib/vtls/sectransp.c +++ b/lib/vtls/sectransp.c @@ -1092,8 +1092,8 @@ static CURLcode sectransp_connect_step1(struct Curl_cfilter *cf, return result; if(connssl->alpn) { -#if (CURL_BUILD_MAC_10_13 || CURL_BUILD_IOS_11) && \ - defined(HAVE_BUILTIN_AVAILABLE) +#if CURL_BUILD_MAC_10_13 || CURL_BUILD_IOS_11 +#ifdef HAVE_BUILTIN_AVAILABLE if(__builtin_available(macOS 10.13.4, iOS 11, tvOS 11, *)) { #else if(&SSLSetALPNProtocols && &SSLCopyALPNProtocols) { @@ -1119,6 +1119,7 @@ static CURLcode sectransp_connect_step1(struct Curl_cfilter *cf, Curl_alpn_to_proto_str(&proto, connssl->alpn); infof(data, VTLS_INFOF_ALPN_OFFER_1STR, proto.data); } +#endif /* CURL_BUILD_MAC_10_13 || CURL_BUILD_IOS_11 */ } if(ssl_config->key) { @@ -2092,8 +2093,8 @@ check_handshake: } if(connssl->alpn) { -#if (CURL_BUILD_MAC_10_13 || CURL_BUILD_IOS_11) && \ - defined(HAVE_BUILTIN_AVAILABLE) +#if CURL_BUILD_MAC_10_13 || CURL_BUILD_IOS_11 +#ifdef HAVE_BUILTIN_AVAILABLE if(__builtin_available(macOS 10.13.4, iOS 11, tvOS 11, *)) { #else if(&SSLSetALPNProtocols && &SSLCopyALPNProtocols) { @@ -2124,6 +2125,7 @@ check_handshake: if(alpnArr) CFRelease(alpnArr); } +#endif /* CURL_BUILD_MAC_10_13 || CURL_BUILD_IOS_11 */ } return CURLE_OK;