Skip to content

M
MariaDB
Commit 24c0b613 authored by Vladislav Vaintroub's avatar Vladislav Vaintroub
Browse files
Options

Fix my_atomic.h on Solaris, do not redefine macros already defined 

in include/atomic/solaris.h
parent c9ac06b3
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 0 deletions
include/my_atomic.h
View file @ 24c0b613
...@@ -69,6 +69,7 @@ ...@@ -69,6 +69,7 @@
#include "atomic/nolock.h" #include "atomic/nolock.h"
#endif #endif
#ifndef MY_ATOMICS_MADE
#ifndef make_atomic_cas_body #ifndef make_atomic_cas_body
/* nolock.h was not able to generate even a CAS function, fall back */ /* nolock.h was not able to generate even a CAS function, fall back */
#include "atomic/rwlock.h" #include "atomic/rwlock.h"
...@@ -277,6 +278,7 @@ make_atomic_store(ptr) ...@@ -277,6 +278,7 @@ make_atomic_store(ptr)
#undef make_atomic_load_body #undef make_atomic_load_body
#undef make_atomic_store_body #undef make_atomic_store_body
#undef make_atomic_fas_body #undef make_atomic_fas_body
#endif /* MY_ATOMICS_MADE */
#undef intptr #undef intptr
/* /*
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7