diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-07-01 18:15:00 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-07-01 18:15:00 +0000 |
| commit | a2a2e32c02643a0cec111511220227703fda1cd5 (patch) | |
| tree | 69cc2b631234c2a8e026b9cd4d72676c61c594df /include/atomic/generic-msvc.h | |
| parent | Releasing progress-linux version 1:10.11.8-1~progress7.99u1. (diff) | |
| download | mariadb-a2a2e32c02643a0cec111511220227703fda1cd5.tar.xz mariadb-a2a2e32c02643a0cec111511220227703fda1cd5.zip | |
Merging upstream version 1:11.4.2.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'include/atomic/generic-msvc.h')
| -rw-r--r-- | include/atomic/generic-msvc.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/atomic/generic-msvc.h b/include/atomic/generic-msvc.h index ff2a5434..8a29f560 100644 --- a/include/atomic/generic-msvc.h +++ b/include/atomic/generic-msvc.h @@ -72,7 +72,7 @@ static inline int64 my_atomic_add64(int64 volatile *a, int64 v) 64-bit Windows. Reads and writes to 64-bit values are not guaranteed to be atomic on 32-bit Windows. - https://msdn.microsoft.com/en-us/library/windows/desktop/ms684122(v=vs.85).aspx + https://learn.microsoft.com/en-us/windows/win32/sync/interlocked-variable-access */ static inline int32 my_atomic_load32(int32 volatile *a) @@ -84,7 +84,7 @@ static inline int32 my_atomic_load32(int32 volatile *a) static inline int64 my_atomic_load64(int64 volatile *a) { -#ifdef _M_X64 +#if defined(_M_X64) || defined(_M_ARM64) int64 value= *a; MemoryBarrier(); return value; @@ -123,7 +123,7 @@ static inline void my_atomic_store32(int32 volatile *a, int32 v) static inline void my_atomic_store64(int64 volatile *a, int64 v) { -#ifdef _M_X64 +#if defined(_M_X64) || defined(_M_ARM64) MemoryBarrier(); *a= v; #else |