diff options
| author | Brad King <brad.king@kitware.com> | 2024-09-10 11:55:39 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2024-09-10 11:55:39 (GMT) |
| commit | 34215cc011fd21a3d5c291e1460e1c189955b834 (patch) | |
| tree | 3a4c5e9ced72c9835b71afe6abe3257c7b47f8d6 | |
| parent | 16fbb8c14245da53f49b0991ad530198262c5f85 (diff) | |
| parent | 628a80773060e62b4f7823e6591d3bf068a074d8 (diff) | |
| download | CMake-34215cc011fd21a3d5c291e1460e1c189955b834.zip CMake-34215cc011fd21a3d5c291e1460e1c189955b834.tar.gz CMake-34215cc011fd21a3d5c291e1460e1c189955b834.tar.bz2 | |
Merge topic 'librhash-glibc-version' into release-3.29
628a807730 librhash: aligned_alloc is not available with glibc < 2.16
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9804
| -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) |