1
0
mirror of https://github.com/xmrig/xmrig.git synced 2026-07-02 15:02:43 -04:00

Compare commits

...

2 Commits

Author SHA1 Message Date
XMRig 850b43c079 Fix build with recent libuv. 2024-03-22 01:22:54 +07:00
XMRig b8e4eaac87 Fix rapidjson assert. 2024-03-21 21:03:35 +07:00
2 changed files with 4 additions and 5 deletions
+1 -1
View File
@@ -162,7 +162,7 @@ if (XMRIG_OS_WIN)
src/crypto/common/VirtualMemory_win.cpp src/crypto/common/VirtualMemory_win.cpp
) )
set(EXTRA_LIBS ws2_32 psapi iphlpapi userenv) set(EXTRA_LIBS ws2_32 psapi iphlpapi userenv dbghelp)
elseif (XMRIG_OS_APPLE) elseif (XMRIG_OS_APPLE)
list(APPEND SOURCES_OS list(APPEND SOURCES_OS
src/App_unix.cpp src/App_unix.cpp
+3 -4
View File
@@ -1,7 +1,7 @@
/* XMRig /* XMRig
* Copyright (c) 2014-2019 heapwolf <https://github.com/heapwolf> * Copyright (c) 2014-2019 heapwolf <https://github.com/heapwolf>
* Copyright (c) 2018-2021 SChernykh <https://github.com/SChernykh> * Copyright (c) 2018-2024 SChernykh <https://github.com/SChernykh>
* Copyright (c) 2016-2021 XMRig <https://github.com/xmrig>, <support@xmrig.com> * Copyright (c) 2016-2024 XMRig <https://github.com/xmrig>, <support@xmrig.com>
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@@ -17,7 +17,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "base/net/http/HttpApiResponse.h" #include "base/net/http/HttpApiResponse.h"
#include "3rdparty/rapidjson/prettywriter.h" #include "3rdparty/rapidjson/prettywriter.h"
#include "3rdparty/rapidjson/stringbuffer.h" #include "3rdparty/rapidjson/stringbuffer.h"
@@ -65,7 +64,7 @@ void xmrig::HttpApiResponse::end()
} }
} }
if (!m_doc.MemberCount()) { if (m_doc.IsObject() && m_doc.ObjectEmpty()) {
return HttpResponse::end(); return HttpResponse::end();
} }