mirrors/xmrig
1
0
Fork 1
mirror of https://github.com/xmrig/xmrig.git synced 2025-12-25 21:52:54 -05:00
Code Issues Projects Releases Wiki Activity

#1150 Fixed argon2 header conflict.

Browse Source
This commit is contained in:
XMRig
2019-10-01 01:18:22 +07:00
parent f60118ee79
commit 158d2e4302
5 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/3rdparty/argon2/lib/argon2.c vendored
View File

@@ -15,7 +15,7 @@
#include <stdlib.h>
#include <stdio.h>
#include "argon2.h"
#include "3rdparty/argon2.h"
#include "encoding.h"
#include "core.h"

2
src/3rdparty/argon2/lib/core.h vendored
View File

@@ -14,7 +14,7 @@
#ifndef ARGON2_CORE_H
#define ARGON2_CORE_H
#include "argon2.h"
#include "3rdparty/argon2.h"
#if defined(_MSC_VER)
#define ALIGN(n) __declspec(align(16))

2
src/3rdparty/argon2/lib/encoding.h vendored
View File

@@ -1,6 +1,6 @@
#ifndef ENCODING_H
#define ENCODING_H
#include "argon2.h"
#include "3rdparty/argon2.h"
#define ARGON2_MAX_DECODED_LANES UINT32_C(255)
#define ARGON2_MIN_DECODED_SALT_LEN UINT32_C(8)

2
src/3rdparty/argon2/lib/impl-select.c vendored
View File

@@ -3,7 +3,7 @@
#include "impl-select.h"
#include "argon2.h"
#include "3rdparty/argon2.h"
#define BENCH_SAMPLES 1024
#define BENCH_MEM_BLOCKS 512