diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-07-01 18:15:00 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-07-01 18:15:00 +0000 |
commit | a2a2e32c02643a0cec111511220227703fda1cd5 (patch) | |
tree | 69cc2b631234c2a8e026b9cd4d72676c61c594df /config.h.cmake | |
parent | Releasing progress-linux version 1:10.11.8-1~progress7.99u1. (diff) | |
download | mariadb-a2a2e32c02643a0cec111511220227703fda1cd5.tar.xz mariadb-a2a2e32c02643a0cec111511220227703fda1cd5.zip |
Merging upstream version 1:11.4.2.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'config.h.cmake')
-rw-r--r-- | config.h.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/config.h.cmake b/config.h.cmake index 49783ce6..11e62b51 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -127,7 +127,6 @@ /* Functions we may want to use. */ #cmakedefine HAVE_ACCEPT4 1 #cmakedefine HAVE_ACCESS 1 -#cmakedefine HAVE_ALARM 1 #cmakedefine HAVE_ALLOCA 1 #cmakedefine HAVE_BFILL 1 #cmakedefine HAVE_INDEX 1 @@ -255,6 +254,7 @@ #cmakedefine HAVE_SOCKADDR_IN6_SIN6_LEN 1 #cmakedefine STRUCT_TIMESPEC_HAS_TV_SEC 1 #cmakedefine STRUCT_TIMESPEC_HAS_TV_NSEC 1 +#cmakedefine STRUCT_TM_HAS_TM_GMTOFF 1 /* this means that valgrind headers and macros are available */ #cmakedefine HAVE_VALGRIND_MEMCHECK_H 1 @@ -384,7 +384,6 @@ #cmakedefine HAVE_GCC_C11_ATOMICS 1 #cmakedefine HAVE_SOLARIS_ATOMIC 1 #cmakedefine NO_FCNTL_NONBLOCK 1 -#cmakedefine NO_ALARM 1 #cmakedefine _LARGE_FILES 1 #cmakedefine _LARGEFILE_SOURCE 1 @@ -500,6 +499,7 @@ #cmakedefine HAVE_EncryptAes128Ctr 1 #cmakedefine HAVE_EncryptAes128Gcm 1 #cmakedefine HAVE_des 1 +#cmakedefine HAVE_hkdf 1 /* Stuff that always need to be defined (compile breaks without it) |