diff options
Diffstat (limited to 'libs/redis/patches/020-fix-atomicvar.patch')
| -rw-r--r-- | libs/redis/patches/020-fix-atomicvar.patch | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/libs/redis/patches/020-fix-atomicvar.patch b/libs/redis/patches/020-fix-atomicvar.patch index 01c18eab2..bf98b0e56 100644 --- a/libs/redis/patches/020-fix-atomicvar.patch +++ b/libs/redis/patches/020-fix-atomicvar.patch @@ -1,16 +1,16 @@ --- a/src/atomicvar.h +++ b/src/atomicvar.h -@@ -68,7 +68,7 @@ - * is reported. */ - // #define __ATOMIC_VAR_FORCE_SYNC_MACROS +@@ -81,7 +81,7 @@ + #define ANNOTATE_HAPPENS_AFTER(v) ((void) v) + #endif --#if !defined(__ATOMIC_VAR_FORCE_SYNC_MACROS) && defined(__ATOMIC_RELAXED) && !defined(__sun) && (!defined(__clang__) || !defined(__APPLE__) || __apple_build_version__ > 4210057) -+#if defined(CONFIG_EDAC_ATOMIC_SCRUB) && !defined(__ATOMIC_VAR_FORCE_SYNC_MACROS) && defined(__ATOMIC_RELAXED) && !defined(__sun) && (!defined(__clang__) || !defined(__APPLE__) || __apple_build_version__ > 4210057) - /* Implementation using __atomic macros. */ - - #define atomicIncr(var,count) __atomic_add_fetch(&var,(count),__ATOMIC_RELAXED) -@@ -82,7 +82,7 @@ - #define atomicSet(var,value) __atomic_store_n(&var,value,__ATOMIC_RELAXED) +-#if !defined(__ATOMIC_VAR_FORCE_SYNC_MACROS) && defined(__STDC_VERSION__) && \ ++#if defined(CONFIG_EDAC_ATOMIC_SCRUB) && !defined(__ATOMIC_VAR_FORCE_SYNC_MACROS) && defined(__STDC_VERSION__) && \ + (__STDC_VERSION__ >= 201112L) && !defined(__STDC_NO_ATOMICS__) + /* Use '_Atomic' keyword if the compiler supports. */ + #undef redisAtomic +@@ -126,7 +126,7 @@ + __atomic_store_n(&var,value,__ATOMIC_SEQ_CST) #define REDIS_ATOMIC_API "atomic-builtin" -#elif defined(HAVE_ATOMIC) |