diff options
author | Brad King <brad.king@kitware.com> | 2024-09-10 12:05:32 (GMT) |
---|---|---|
committer | Kitware Robot <kwrobot@kitware.com> | 2024-09-10 12:06:09 (GMT) |
commit | cd74a146335c3f7e5951b48d47629807f4724674 (patch) | |
tree | 03983ebedb096a66a0a347e16f42a159aadb2c9a /Utilities | |
parent | 605ecca2a4520947690a86fd7d96f5e9887185af (diff) | |
parent | 628a80773060e62b4f7823e6591d3bf068a074d8 (diff) | |
download | CMake-cd74a146335c3f7e5951b48d47629807f4724674.zip CMake-cd74a146335c3f7e5951b48d47629807f4724674.tar.gz CMake-cd74a146335c3f7e5951b48d47629807f4724674.tar.bz2 |
Merge topic 'librhash-glibc-version'
628a807730 librhash: aligned_alloc is not available with glibc < 2.16
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9804
Diffstat (limited to 'Utilities')
-rw-r--r-- | Utilities/cmlibrhash/librhash/util.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Utilities/cmlibrhash/librhash/util.h b/Utilities/cmlibrhash/librhash/util.h index a0a0674..4da1be6 100644 --- a/Utilities/cmlibrhash/librhash/util.h +++ b/Utilities/cmlibrhash/librhash/util.h @@ -44,7 +44,7 @@ extern "C" { # define rhash_aligned_free(ptr) _aligned_free(ptr) #elif !defined(NO_STDC_ALIGNED_ALLOC) && (__STDC_VERSION__ >= 201112L || defined(_ISOC11_SOURCE)) \ - && !(defined(__GLIBC__) && (__GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 15))) \ + && !(defined(__GLIBC__) && (__GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 16))) \ && !(defined(__ibmxl__) && defined(__clang__) && defined(__linux__)) \ && !defined(__APPLE__) && !defined(__HAIKU__) && !defined(__sun) \ && (!defined(__ANDROID_API__) || __ANDROID_API__ >= 28) |