Skip to content

Compilation fixes for Bullseye #36

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rkd77 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Compilation fixes for Bullseye #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/common/api/Httpd.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,19 +126,19 @@ void Httpd::run()
}


int Httpd::handler(void *cls, struct MHD_Connection *connection, const char *url, const char *method, const char *version, const char *uploadData, size_t *uploadSize, void **con_cls)
MHD_Result Httpd::handler(void *cls, struct MHD_Connection *connection, const char *url, const char *method, const char *version, const char *uploadData, size_t *uploadSize, void **con_cls)
{
xmrig::HttpRequest req(connection, url, method, uploadData, uploadSize, con_cls);

if (req.method() == xmrig::HttpRequest::Options) {
return req.end(MHD_HTTP_OK, nullptr);
return static_cast<MHD_Result>(req.end(MHD_HTTP_OK, nullptr));
}

if (req.method() == xmrig::HttpRequest::Unsupported) {
return req.end(MHD_HTTP_METHOD_NOT_ALLOWED, nullptr);
return static_cast<MHD_Result>(req.end(MHD_HTTP_METHOD_NOT_ALLOWED, nullptr));
}

return static_cast<Httpd*>(cls)->process(req);
return static_cast<MHD_Result>(static_cast<Httpd*>(cls)->process(req));
}


Expand Down
4 changes: 2 additions & 2 deletions src/common/api/Httpd.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
#ifndef __HTTPD_H__
#define __HTTPD_H__


#include <microhttpd.h>
#include <uv.h>


Expand Down Expand Up @@ -55,7 +55,7 @@ class Httpd
int process(xmrig::HttpRequest &req);
void run();

static int handler(void *cls, MHD_Connection *connection, const char *url, const char *method, const char *version, const char *uploadData, size_t *uploadSize, void **con_cls);
static MHD_Result handler(void *cls, MHD_Connection *connection, const char *url, const char *method, const char *version, const char *uploadData, size_t *uploadSize, void **con_cls);
static void onTimer(uv_timer_t *handle);

bool m_idle;
Expand Down