Archive/openmohaa
0
0
Fork 0
mirror of https://github.com/openmoh/openmohaa.git synced 2025-04-28 13:47:58 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix compile error when libcurl is not installed

Browse source
This commit is contained in:
smallmodel 2025-03-12 23:18:11 +01:00
parent 0f8969e076
commit 22a34d8d68
No known key found for this signature in database
GPG key ID: 9F2D623CEDF08512
1 changed files with 8 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

30
code/sys/sys_update_checker.cpp
View file

@ -24,14 +24,14 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#include "../qcommon/q_version.h" #include "../qcommon/q_version.h"
#ifdef HAS_LIBCURL #ifdef HAS_LIBCURL
# include <curl/curl.h> # include <curl/curl.h>
#endif
//#include <httplib.h> //#include <httplib.h>
# include "../qcommon/json.hpp" #include "../qcommon/json.hpp"
using json = nlohmann::json; using json = nlohmann::json;
# include <chrono> #include <chrono>
UpdateChecker updateChecker; UpdateChecker updateChecker;
@ -67,6 +67,7 @@ UpdateChecker::~UpdateChecker()
void UpdateChecker::Init() void UpdateChecker::Init()
{ {
#ifdef HAS_LIBCURL
CURLcode result; CURLcode result;
assert(!handle); assert(!handle);
@ -90,6 +91,7 @@ void UpdateChecker::Init()
curl_easy_setopt(handle, CURLOPT_USERAGENT, "curl"); curl_easy_setopt(handle, CURLOPT_USERAGENT, "curl");
thread = new std::thread(&UpdateChecker::RequestThread, this); thread = new std::thread(&UpdateChecker::RequestThread, this);
#endif
} }
void UpdateChecker::Process() void UpdateChecker::Process()
@ -122,6 +124,7 @@ void UpdateChecker::Shutdown()
void UpdateChecker::ShutdownClient() void UpdateChecker::ShutdownClient()
{ {
#ifdef HAS_LIBCURL
std::lock_guard<std::shared_mutex> l(clientMutex); std::lock_guard<std::shared_mutex> l(clientMutex);
if (!handle) { if (!handle) {
@ -130,6 +133,7 @@ void UpdateChecker::ShutdownClient()
curl_easy_cleanup(handle); curl_easy_cleanup(handle);
handle = NULL; handle = NULL;
#endif
} }
void UpdateChecker::ShutdownThread() void UpdateChecker::ShutdownThread()
@ -229,6 +233,7 @@ bool UpdateChecker::ParseVersionNumber(const char *value, int& major, int& minor
return true; return true;
} }
#ifdef HAS_LIBCURL
size_t WriteCallback(char *contents, size_t size, size_t nmemb, void *userp) size_t WriteCallback(char *contents, size_t size, size_t nmemb, void *userp)
{ {
std::string& responseString = *(std::string *)userp; std::string& responseString = *(std::string *)userp;
@ -290,23 +295,4 @@ void UpdateChecker::RequestThread()
std::this_thread::sleep_for(std::chrono::seconds(5)); std::this_thread::sleep_for(std::chrono::seconds(5));
} }
} }
#else
bool UpdateChecker::CheckNewVersion() const
{
return false;
}
bool UpdateChecker::CheckNewVersion(int& major, int& minor, int& patch) const
{
return false;
}
void Sys_UpdateChecker_Init() {}
void Sys_UpdateChecker_Process() {}
void Sys_UpdateChecker_Shutdown() {}
#endif #endif