diff options
| author | Brad King <brad.king@kitware.com> | 2020-12-14 12:14:12 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-12-14 12:14:16 (GMT) |
| commit | 7ad7ac4167a5551bd88300f8069f59b4265da4fd (patch) | |
| tree | c76aa2b712677a2976e830bcb0c731cb7403429a /Utilities/cmcurl/lib/smb.h | |
| parent | b4a17cc0cc0fec6bf08c892f467cc8818ba2eb3c (diff) | |
| parent | d0bac89ceacaf04d36d3e2edf09b76e53496705c (diff) | |
| download | CMake-7ad7ac4167a5551bd88300f8069f59b4265da4fd.zip CMake-7ad7ac4167a5551bd88300f8069f59b4265da4fd.tar.gz CMake-7ad7ac4167a5551bd88300f8069f59b4265da4fd.tar.bz2 | |
Merge topic 'update-curl'
d0bac89cea curl: Set build options the way we need for CMake
54931fdff0 Merge branch 'upstream-curl' into update-curl
5aacc593a9 curl 2020-12-09 (e0528597)
4cd65e5d88 curl: Update script to get curl 7.74.0
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5592
Diffstat (limited to 'Utilities/cmcurl/lib/smb.h')
| -rw-r--r-- | Utilities/cmcurl/lib/smb.h | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/Utilities/cmcurl/lib/smb.h b/Utilities/cmcurl/lib/smb.h index 136a89c..907cf0c 100644 --- a/Utilities/cmcurl/lib/smb.h +++ b/Utilities/cmcurl/lib/smb.h @@ -12,7 +12,7 @@ * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms - * are also available at https://curl.haxx.se/docs/copyright.html. + * are also available at https://curl.se/docs/copyright.html. * * You may opt to use, copy, modify, merge, publish, distribute and/or sell * copies of the Software, and permit persons to whom the Software is @@ -243,16 +243,13 @@ struct smb_tree_disconnect { #endif /* BUILDING_CURL_SMB_C */ -#if !defined(CURL_DISABLE_SMB) && defined(USE_NTLM) && \ +#if !defined(CURL_DISABLE_SMB) && defined(USE_CURL_NTLM_CORE) && \ (CURL_SIZEOF_CURL_OFF_T > 4) -#if !defined(USE_WINDOWS_SSPI) || defined(USE_WIN32_CRYPTO) - extern const struct Curl_handler Curl_handler_smb; extern const struct Curl_handler Curl_handler_smbs; -#endif /* !USE_WINDOWS_SSPI || USE_WIN32_CRYPTO */ - -#endif /* CURL_DISABLE_SMB && USE_NTLM && CURL_SIZEOF_CURL_OFF_T > 4 */ +#endif /* CURL_DISABLE_SMB && USE_CURL_NTLM_CORE && + CURL_SIZEOF_CURL_OFF_T > 4 */ #endif /* HEADER_CURL_SMB_H */ |