From 158d2e4302100805804eabf56faac3cd6ab424f1 Mon Sep 17 00:00:00 2001
From: XMRig <support@xmrig.com>
Date: Tue, 1 Oct 2019 01:18:22 +0700
Subject: [PATCH] #1150 Fixed argon2 header conflict.

---
 src/3rdparty/argon2/CMakeLists.txt    | 4 ++--
 src/3rdparty/argon2/lib/argon2.c      | 2 +-
 src/3rdparty/argon2/lib/core.h        | 2 +-
 src/3rdparty/argon2/lib/encoding.h    | 2 +-
 src/3rdparty/argon2/lib/impl-select.c | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/3rdparty/argon2/CMakeLists.txt b/src/3rdparty/argon2/CMakeLists.txt
index f77835f3..f800a0c8 100644
--- a/src/3rdparty/argon2/CMakeLists.txt
+++ b/src/3rdparty/argon2/CMakeLists.txt
@@ -38,7 +38,7 @@ if (CMAKE_C_COMPILER_ID MATCHES MSVC)
 elseif (NOT XMRIG_ARM AND CMAKE_SIZEOF_VOID_P EQUAL 8)
     function(add_feature_impl FEATURE GCC_FLAG DEF)
         add_library(argon2-${FEATURE} STATIC arch/x86_64/lib/argon2-${FEATURE}.c)
-        target_include_directories(argon2-${FEATURE} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include)
+        target_include_directories(argon2-${FEATURE} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../../)
         target_include_directories(argon2-${FEATURE} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/lib)
         set_target_properties(argon2-${FEATURE} PROPERTIES POSITION_INDEPENDENT_CODE True)
 
@@ -84,5 +84,5 @@ endif()
 add_library(argon2 STATIC ${ARGON2_SOURCES})
 target_link_libraries(argon2 ${ARGON2_LIBS})
 
-target_include_directories(argon2 PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include)
+target_include_directories(argon2 PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../../)
 target_include_directories(argon2 PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/lib)
diff --git a/src/3rdparty/argon2/lib/argon2.c b/src/3rdparty/argon2/lib/argon2.c
index d4d038a9..b2eafd2f 100644
--- a/src/3rdparty/argon2/lib/argon2.c
+++ b/src/3rdparty/argon2/lib/argon2.c
@@ -15,7 +15,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 
-#include "argon2.h"
+#include "3rdparty/argon2.h"
 #include "encoding.h"
 #include "core.h"
 
diff --git a/src/3rdparty/argon2/lib/core.h b/src/3rdparty/argon2/lib/core.h
index 5c67fa36..8a3227a9 100644
--- a/src/3rdparty/argon2/lib/core.h
+++ b/src/3rdparty/argon2/lib/core.h
@@ -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))
diff --git a/src/3rdparty/argon2/lib/encoding.h b/src/3rdparty/argon2/lib/encoding.h
index e7834e4f..742fe888 100644
--- a/src/3rdparty/argon2/lib/encoding.h
+++ b/src/3rdparty/argon2/lib/encoding.h
@@ -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)
diff --git a/src/3rdparty/argon2/lib/impl-select.c b/src/3rdparty/argon2/lib/impl-select.c
index d618010c..965b639e 100644
--- a/src/3rdparty/argon2/lib/impl-select.c
+++ b/src/3rdparty/argon2/lib/impl-select.c
@@ -3,7 +3,7 @@
 
 #include "impl-select.h"
 
-#include "argon2.h"
+#include "3rdparty/argon2.h"
 
 #define BENCH_SAMPLES 1024
 #define BENCH_MEM_BLOCKS 512