mirror of
https://github.com/xmrig/xmrig.git
synced 2025-12-27 06:20:51 -05:00
Resolved conflict between argon2 implementations.
This commit is contained in:
@@ -27,10 +27,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
#include <new>
|
||||
#include "allocator.hpp"
|
||||
#include "intrin_portable.h"
|
||||
#include "virtual_memory.hpp"
|
||||
#include "common.hpp"
|
||||
#include "crypto/randomx/allocator.hpp"
|
||||
#include "crypto/randomx/intrin_portable.h"
|
||||
#include "crypto/randomx/virtual_memory.hpp"
|
||||
#include "crypto/randomx/common.hpp"
|
||||
|
||||
namespace randomx {
|
||||
|
||||
@@ -57,4 +57,4 @@ namespace randomx {
|
||||
freePagedMemory(ptr, count);
|
||||
};
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user