From b380514764cf857469bae61c11143a19f79a74c5 Mon Sep 17 00:00:00 2001 From: andreasnaive Date: Mon, 25 Mar 2019 23:13:40 +0100 Subject: Revert "conflict resolution (nw)" This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing changes made to 009cba4fb8102102168ef32870892438327f3705. --- 3rdparty/lzma/C/AesOpt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '3rdparty/lzma/C/AesOpt.c') diff --git a/3rdparty/lzma/C/AesOpt.c b/3rdparty/lzma/C/AesOpt.c index 8234f0d1465..10a8fb25c51 100644 --- a/3rdparty/lzma/C/AesOpt.c +++ b/3rdparty/lzma/C/AesOpt.c @@ -6,7 +6,7 @@ #include "CpuArch.h" #ifdef MY_CPU_X86_OR_AMD64 -#if _MSC_VER >= 1500 && !defined(__clang__) +#if _MSC_VER >= 1500 #define USE_INTEL_AES #endif #endif -- cgit v1.2.3-70-g09d2