diff options
| author | Sergey Vojtovich <svoj@mariadb.org> | 2016-11-03 13:21:18 +0400 |
|---|---|---|
| committer | Sergey Vojtovich <svoj@mariadb.org> | 2016-12-13 16:38:20 +0400 |
| commit | c10e523d78756348d7128aff4bc00dcef8a0bec9 (patch) | |
| tree | 69d7fd650bcc0f1fac8552a9931d9e93e37ac096 /include/my_atomic.h | |
| parent | 81f280789b30c070ce6e854dddcd59b28b81af7a (diff) | |
| download | mariadb-git-c10e523d78756348d7128aff4bc00dcef8a0bec9.tar.gz | |
MDEV-11212 - Clean-up MariaDB atomic operations
No more black magic for gcc atomic bultins. Fixes some warnings.
Diffstat (limited to 'include/my_atomic.h')
| -rw-r--r-- | include/my_atomic.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/my_atomic.h b/include/my_atomic.h index 066fe9fddf0..fdd95b94039 100644 --- a/include/my_atomic.h +++ b/include/my_atomic.h @@ -115,6 +115,7 @@ #endif +#ifndef HAVE_GCC_C11_ATOMICS #ifndef make_atomic_cas_body /* nolock.h was not able to generate even a CAS function, fall back */ #error atomic ops for this platform are not implemented @@ -220,6 +221,7 @@ make_atomic_store(ptr) #undef make_atomic_store_body #undef make_atomic_fas_body #undef intptr +#endif /* the macro below defines (as an expression) the code that |