summaryrefslogtreecommitdiffstatshomepage
path: root/3rdparty/lzma/C
diff options
context:
space:
mode:
author andreasnaive <andreasnaive@gmail.com>2019-03-25 22:44:58 +0100
committer andreasnaive <andreasnaive@gmail.com>2019-03-25 22:44:58 +0100
commitc24473ddff715ecec2e258a6eb38960cf8c8e98e (patch)
tree8ea44b6396a6129913c0aac13859b5de9965e972 /3rdparty/lzma/C
parent009cba4fb8102102168ef32870892438327f3705 (diff)
parent598cd5227223c3b04ca31f0dbc1981256d9ea3ff (diff)
conflict resolution (nw)
Diffstat (limited to '3rdparty/lzma/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 10a8fb25c51..8234f0d1465 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
+#if _MSC_VER >= 1500 && !defined(__clang__)
#define USE_INTEL_AES
#endif
#endif