1
0
mirror of https://github.com/xmrig/xmrig.git synced 2025-12-25 05:40:39 -05:00

Merge xmrig v6.11.0 into master

This commit is contained in:
MoneroOcean
2021-04-06 15:17:08 +00:00
41 changed files with 760 additions and 275 deletions

View File

@@ -91,7 +91,7 @@ bool xmrig::FileLogWriter::writeLine(const char *data, size_t size)
{
const uv_buf_t buf[2] = {
uv_buf_init(new char[size], size),
uv_buf_init(m_endl, sizeof(m_endl) - 1)
uv_buf_init(const_cast<char *>(m_endl), sizeof(m_endl) - 1)
};
memcpy(buf[0].base, data, size);

View File

@@ -42,9 +42,9 @@ public:
private:
# ifdef XMRIG_OS_WIN
char m_endl[3] = "\r\n";
const char m_endl[3] = {'\r', '\n', 0};
# else
char m_endl[2] = "\n";
const char m_endl[2] = {'\n', 0};
# endif
int m_file = -1;