summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Vojtovich <svoj@mariadb.org>2016-11-17 14:50:09 +0400
committerSergey Vojtovich <svoj@mariadb.org>2016-11-17 14:50:09 +0400
commit527f7c451e9c1f2710bdffb2fab717139bcbc63d (patch)
tree1239a1e266b9137f8b95e6a97855737340b4cec5
parenta8d535435c4d37772c133c58a9d128a10f7537ac (diff)
downloadmariadb-git-bb-10.2-mdev11212.tar.gz
MDEV-11212 - Clean-up MariaDB atomic operationsbb-10.2-mdev11212
According to gcc manual sync builtins are getting deprecated. Make compilation possible if only atomic builtins are available.
-rw-r--r--include/my_atomic.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/my_atomic.h b/include/my_atomic.h
index fdd95b94039..5860426304e 100644
--- a/include/my_atomic.h
+++ b/include/my_atomic.h
@@ -110,7 +110,7 @@
#include "atomic/generic-msvc.h"
#elif defined(HAVE_SOLARIS_ATOMIC)
#include "atomic/solaris.h"
-#elif defined(HAVE_GCC_ATOMIC_BUILTINS)
+#elif defined(HAVE_GCC_ATOMIC_BUILTINS) || defined(HAVE_GCC_C11_ATOMICS)
#include "atomic/gcc_builtins.h"
#endif