diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2021-10-28 23:39:29 +0200 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2021-10-28 23:39:29 +0200 |
| commit | 6aa8eba99f491dea7679e64568454b823ab1c9b6 (patch) | |
| tree | 43ef9cb4c1f6c5be63091bb8d29d95bf79bb9b1e | |
| parent | 355057b26d2c822fd659879815fad3205ad7ac1e (diff) | |
| download | mariadb-git-10.6-clang-cl.tar.gz | |
Fix broken clang-cl header files (declared xbegin instead of _xbegin)10.6-clang-cl
clang-cl won't have lock elision then
| -rw-r--r-- | storage/innobase/include/transactional_lock_guard.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/innobase/include/transactional_lock_guard.h b/storage/innobase/include/transactional_lock_guard.h index 7ece27638fc..3167055630c 100644 --- a/storage/innobase/include/transactional_lock_guard.h +++ b/storage/innobase/include/transactional_lock_guard.h @@ -20,7 +20,7 @@ this program; if not, write to the Free Software Foundation, Inc., #if defined __powerpc64__ && defined __clang__ && defined __linux__ #elif defined __powerpc64__&&defined __GNUC__&&defined __linux__&&__GNUC__ > 4 -#elif defined _MSC_VER && (defined _M_IX86 || defined _M_X64) +#elif defined _MSC_VER && (defined _M_IX86 || defined _M_X64) && !defined(__clang__) #elif defined __GNUC__ && (defined __i386__ || defined __x86_64__) # if __GNUC__ >= 8 # elif defined __clang_major__ && __clang_major__ > 6 |