summaryrefslogtreecommitdiffstatshomepage
path: root/3rdparty/lzma/C/AesOpt.c
diff options
context:
space:
mode:
author andreasnaive <andreasnaive@gmail.com>2019-03-25 23:13:40 +0100
committer andreasnaive <andreasnaive@gmail.com>2019-03-25 23:13:40 +0100
commitb380514764cf857469bae61c11143a19f79a74c5 (patch)
tree63c8012e262618f08a332da31dd714281aa2c5ed /3rdparty/lzma/C/AesOpt.c
parentc24473ddff715ecec2e258a6eb38960cf8c8e98e (diff)
Revert "conflict resolution (nw)"
This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing changes made to 009cba4fb8102102168ef32870892438327f3705.
Diffstat (limited to '3rdparty/lzma/C/AesOpt.c')
-rw-r--r--3rdparty/lzma/C/AesOpt.c2
1 files changed, 1 insertions, 1 deletions
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