summaryrefslogtreecommitdiff
path: root/config.h.cmake
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2022-06-21 18:02:41 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2022-06-21 18:02:41 +0300
commit6680fd8d4b1f5fa8488608ca9e528e56f338dba4 (patch)
tree0f47a9e5529d99fba55554343b8eae905a53754c /config.h.cmake
parent2643aa43ae78c1b54aa2f374d85c205d25419fee (diff)
parent37946731110246b89607b85b391f32b0f390524e (diff)
downloadmariadb-git-6680fd8d4b1f5fa8488608ca9e528e56f338dba4.tar.gz
Merge 10.6 into 10.7
Diffstat (limited to 'config.h.cmake')
-rw-r--r--config.h.cmake2
1 files changed, 1 insertions, 1 deletions
diff --git a/config.h.cmake b/config.h.cmake
index 99acaf71bee..46d7b209246 100644
--- a/config.h.cmake
+++ b/config.h.cmake
@@ -19,6 +19,7 @@
/* Headers we may want to use. */
#cmakedefine STDC_HEADERS 1
#cmakedefine _GNU_SOURCE 1
+#cmakedefine HAVE_ALIGNED_ALLOC 1
#cmakedefine HAVE_ALLOCA_H 1
#cmakedefine HAVE_ARPA_INET_H 1
#cmakedefine HAVE_ASM_TERMBITS_H 1
@@ -163,7 +164,6 @@
#cmakedefine HAVE_LRAND48 1
#cmakedefine HAVE_LOCALTIME_R 1
#cmakedefine HAVE_LSTAT 1
-#cmakedefine HAVE_MEMALIGN 1
/* #cmakedefine HAVE_MLOCK 1 see Bug#54662 */
#cmakedefine HAVE_NL_LANGINFO 1
#cmakedefine HAVE_MADVISE 1