diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-08-23 10:44:06 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-08-23 10:44:06 +0300 |
commit | 2b66cd249384221e2a892f655fe84bb58ddc31bd (patch) | |
tree | ce42f7cfde3d256480b9dbfad496b5164e5490cc /storage/innobase/innodb.cmake | |
parent | 1002703baa13647b5f43509fccbb79c17ed5c0c7 (diff) | |
parent | cfbdb5d21072b16ae94c04b6b46db42f500be4c8 (diff) | |
download | mariadb-git-2b66cd249384221e2a892f655fe84bb58ddc31bd.tar.gz |
Merge 10.3 into 10.4
Diffstat (limited to 'storage/innobase/innodb.cmake')
-rw-r--r-- | storage/innobase/innodb.cmake | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/storage/innobase/innodb.cmake b/storage/innobase/innodb.cmake index 929b17ef52d..45563dfd9e0 100644 --- a/storage/innobase/innodb.cmake +++ b/storage/innobase/innodb.cmake @@ -197,11 +197,6 @@ ENDIF(NOT MSVC) CHECK_FUNCTION_EXISTS(vasprintf HAVE_VASPRINTF) -CHECK_CXX_SOURCE_COMPILES("struct t1{ int a; char *b; }; struct t1 c= { .a=1, .b=0 }; main() { }" HAVE_C99_INITIALIZERS) -IF(HAVE_C99_INITIALIZERS) - ADD_DEFINITIONS(-DHAVE_C99_INITIALIZERS) -ENDIF() - SET(MUTEXTYPE "event" CACHE STRING "Mutex type: event, sys or futex") IF(MUTEXTYPE MATCHES "event") |