From 259a1774caaced0ca011bb160691f0d485ff1508 Mon Sep 17 00:00:00 2001 From: XMRig Date: Sat, 21 Apr 2018 21:41:39 +0700 Subject: [PATCH] Fix Linux build. --- src/App_unix.cpp | 2 +- src/Mem_unix.cpp | 2 +- src/common/net/Job.h | 1 + src/core/Controller.cpp | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/App_unix.cpp b/src/App_unix.cpp index f739e42e..45f73d2d 100644 --- a/src/App_unix.cpp +++ b/src/App_unix.cpp @@ -29,9 +29,9 @@ #include "App.h" +#include "common/log/Log.h" #include "core/Config.h" #include "core/Controller.h" -#include "log/Log.h" void App::background() diff --git a/src/Mem_unix.cpp b/src/Mem_unix.cpp index 229a0d46..c1aa0fb1 100644 --- a/src/Mem_unix.cpp +++ b/src/Mem_unix.cpp @@ -27,10 +27,10 @@ #include +#include "common/log/Log.h" #include "common/utils/mm_malloc.h" #include "common/xmrig.h" #include "crypto/CryptoNight.h" -#include "log/Log.h" #include "Mem.h" diff --git a/src/common/net/Job.h b/src/common/net/Job.h index 0e2951f3..c235072e 100644 --- a/src/common/net/Job.h +++ b/src/common/net/Job.h @@ -58,6 +58,7 @@ public: inline uint32_t *nonce() { return reinterpret_cast(m_blob + 39); } inline uint32_t diff() const { return static_cast(m_diff); } inline uint64_t target() const { return m_target; } + inline void reset() { m_size = 0; m_diff = 0; } inline void setClientId(const xmrig::Id &id) { m_clientId = id; } inline void setPoolId(int poolId) { m_poolId = poolId; } inline void setThreadId(int threadId) { m_threadId = threadId; } diff --git a/src/core/Controller.cpp b/src/core/Controller.cpp index d0babe47..b1e03f32 100644 --- a/src/core/Controller.cpp +++ b/src/core/Controller.cpp @@ -38,7 +38,7 @@ #ifdef HAVE_SYSLOG_H -# include "log/SysLog.h" +# include "common/log/SysLog.h" #endif