44 lines
1.7 KiB
Diff
44 lines
1.7 KiB
Diff
|
From a0776ec857a40991f8ff82e49d9e9a0302848038 Mon Sep 17 00:00:00 2001
|
||
|
|
From: wang--ge <wang__ge@126.com>
|
||
|
|
Date: Tue, 4 Jul 2023 15:02:53 +0800
|
||
|
|
Subject: [PATCH] fix build failure due to gcc updated
|
||
|
|
|
||
|
|
---
|
||
|
|
ext_libs/sqlite/sqlite3.c | 6 +++++-
|
||
|
|
mlxfwupdate/server_request.cpp | 2 +-
|
||
|
|
2 files changed, 6 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/ext_libs/sqlite/sqlite3.c b/ext_libs/sqlite/sqlite3.c
|
||
|
|
index e198678..e244656 100755
|
||
|
|
--- a/ext_libs/sqlite/sqlite3.c
|
||
|
|
+++ b/ext_libs/sqlite/sqlite3.c
|
||
|
|
@@ -100249,7 +100249,11 @@ SQLITE_PRIVATE void sqlite3DefaultRowEst(Index *pIdx){
|
||
|
|
** number of rows in the table. Or 10, if the estimated number of rows
|
||
|
|
** in the table is less than that. */
|
||
|
|
a[0] = pIdx->pTable->nRowLogEst;
|
||
|
|
- if( a[0]<33 ) a[0] = 33; assert( 33==sqlite3LogEst(10) );
|
||
|
|
+ if( a[0]<33 ) {
|
||
|
|
+ a[0] = 33;
|
||
|
|
+ }
|
||
|
|
+
|
||
|
|
+ assert( 33==sqlite3LogEst(10) );
|
||
|
|
|
||
|
|
/* Estimate that a[1] is 10, a[2] is 9, a[3] is 8, a[4] is 7, a[5] is
|
||
|
|
** 6 and each subsequent value (if any) is 5. */
|
||
|
|
diff --git a/mlxfwupdate/server_request.cpp b/mlxfwupdate/server_request.cpp
|
||
|
|
index a33559a..46a19fa 100644
|
||
|
|
--- a/mlxfwupdate/server_request.cpp
|
||
|
|
+++ b/mlxfwupdate/server_request.cpp
|
||
|
|
@@ -482,7 +482,7 @@ int ServerRequest::curl_request(const char *url,
|
||
|
|
// Internal CURL progressmeter must be disabled if we provide our own callback
|
||
|
|
curl_easy_setopt(_curl, CURLOPT_NOPROGRESS, false);
|
||
|
|
// Install the callback function
|
||
|
|
- curl_easy_setopt(_curl, CURLOPT_PROGRESSFUNCTION, progress_func);
|
||
|
|
+ curl_easy_setopt(_curl, CURLOPT_XFERINFOFUNCTION, progress_func);
|
||
|
|
}
|
||
|
|
if (_Proxy.size() > 0) {
|
||
|
|
curl_easy_setopt(_curl, CURLOPT_PROXY, _Proxy.c_str());
|
||
|
|
--
|
||
|
|
2.33.0
|
||
|
|
|