#1150 Fixed argon2 header conflict.
This commit is contained in:
parent
f60118ee79
commit
158d2e4302
5 changed files with 6 additions and 6 deletions
2
src/3rdparty/argon2/lib/core.h
vendored
2
src/3rdparty/argon2/lib/core.h
vendored
|
@ -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))
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue