Remove align.h.
This commit is contained in:
parent
f9a3315d75
commit
7adf30e326
4 changed files with 4 additions and 43 deletions
33
src/3rdparty/align.h
vendored
33
src/3rdparty/align.h
vendored
|
@ -1,33 +0,0 @@
|
||||||
/* XMRig
|
|
||||||
* Copyright 2010 Jeff Garzik <jgarzik@pobox.com>
|
|
||||||
* Copyright 2012-2014 pooler <pooler@litecoinpool.org>
|
|
||||||
* Copyright 2014 Lucas Jones <https://github.com/lucasjones>
|
|
||||||
* Copyright 2014-2016 Wolf9466 <https://github.com/OhGodAPet>
|
|
||||||
* Copyright 2016 Jay D Dee <jayddee246@gmail.com>
|
|
||||||
* Copyright 2016-2017 XMRig <support@xmrig.com>
|
|
||||||
*
|
|
||||||
*
|
|
||||||
* 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
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef __ALIGN_H__
|
|
||||||
#define __ALIGN_H__
|
|
||||||
|
|
||||||
#ifdef _MSC_VER
|
|
||||||
# define VAR_ALIGN(x, decl) __declspec(align(x)) decl
|
|
||||||
#else
|
|
||||||
# define VAR_ALIGN(x, decl) decl __attribute__ ((aligned(x)))
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif /* __ALIGN_H__ */
|
|
|
@ -30,9 +30,6 @@
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
|
|
||||||
|
|
||||||
#include "align.h"
|
|
||||||
|
|
||||||
|
|
||||||
struct cryptonight_ctx;
|
struct cryptonight_ctx;
|
||||||
|
|
||||||
|
|
||||||
|
@ -63,7 +60,7 @@ private:
|
||||||
static int m_threads;
|
static int m_threads;
|
||||||
static size_t m_offset;
|
static size_t m_offset;
|
||||||
static size_t m_size;
|
static size_t m_size;
|
||||||
VAR_ALIGN(16, static uint8_t *m_memory);
|
alignas(16) static uint8_t *m_memory;
|
||||||
|
|
||||||
# ifndef XMRIG_NO_AEON
|
# ifndef XMRIG_NO_AEON
|
||||||
static cryptonight_ctx *createLite(int threadId);
|
static cryptonight_ctx *createLite(int threadId);
|
||||||
|
|
|
@ -30,8 +30,6 @@
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
|
|
||||||
|
|
||||||
#include "align.h"
|
|
||||||
|
|
||||||
#define AEON_MEMORY 1048576
|
#define AEON_MEMORY 1048576
|
||||||
#define AEON_MASK 0xFFFF0
|
#define AEON_MASK 0xFFFF0
|
||||||
#define AEON_ITER 0x40000
|
#define AEON_ITER 0x40000
|
||||||
|
@ -42,9 +40,9 @@
|
||||||
|
|
||||||
|
|
||||||
struct cryptonight_ctx {
|
struct cryptonight_ctx {
|
||||||
VAR_ALIGN(16, uint8_t state0[200]);
|
alignas(16) uint8_t state0[200];
|
||||||
VAR_ALIGN(16, uint8_t state1[200]);
|
alignas(16) uint8_t state1[200];
|
||||||
VAR_ALIGN(16, uint8_t* memory);
|
alignas(16) uint8_t* memory;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -26,7 +26,6 @@
|
||||||
#define __DOUBLEWORKER_H__
|
#define __DOUBLEWORKER_H__
|
||||||
|
|
||||||
|
|
||||||
#include "align.h"
|
|
||||||
#include "net/Job.h"
|
#include "net/Job.h"
|
||||||
#include "net/JobResult.h"
|
#include "net/JobResult.h"
|
||||||
#include "workers/Worker.h"
|
#include "workers/Worker.h"
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue