haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CURLINFO_SIZE_DOWNLOAD_T is a enum entry, use the version check instead 

(cherry picked from commit c189053ee5)
This commit is contained in:
Marek Roszko 2023-02-14 23:44:46 -05:00 committed by Mark Roszko
parent 90fb075e34
commit 3b5c38d861
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/kicad_curl/kicad_curl_easy.cpp
View File

@ -264,7 +264,7 @@ bool KICAD_CURL_EASY::SetTransferCallback( const TRANSFER_CALLBACK& aCallback, s
{ {
progress = std::make_unique<CURL_PROGRESS>( this, aCallback, progress = std::make_unique<CURL_PROGRESS>( this, aCallback,
static_cast<curl_off_t>( aInterval ) ); static_cast<curl_off_t>( aInterval ) );
#if LIBCURL_VERSION_NUM >= 0x072000 #if LIBCURL_VERSION_NUM >= 0x072000 // 7.32.0
setOption( CURLOPT_XFERINFOFUNCTION, xferinfo ); setOption( CURLOPT_XFERINFOFUNCTION, xferinfo );
setOption( CURLOPT_XFERINFODATA, progress.get() ); setOption( CURLOPT_XFERINFODATA, progress.get() );
#else #else
@ -286,7 +286,7 @@ bool KICAD_CURL_EASY::SetOutputStream( const std::ostream* aOutput )
int KICAD_CURL_EASY::GetTransferTotal( uint64_t& aDownloadedBytes ) const int KICAD_CURL_EASY::GetTransferTotal( uint64_t& aDownloadedBytes ) const
{ {
#ifdef CURLINFO_SIZE_DOWNLOAD_T #if LIBCURL_VERSION_NUM >= 0x073700 // 7.55.0
curl_off_t dl; curl_off_t dl;
int result = curl_easy_getinfo( m_CURL, CURLINFO_SIZE_DOWNLOAD_T, &dl ); int result = curl_easy_getinfo( m_CURL, CURLINFO_SIZE_DOWNLOAD_T, &dl );
aDownloadedBytes = static_cast<uint64_t>( dl ); aDownloadedBytes = static_cast<uint64_t>( dl );