mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-07-31 10:58:21 -07:00
03ce8236d7
This reverts commit 8ff260f7dc.
This breaks sci-libs/spqr.
Signed-off-by: Sam James <sam@gentoo.org>
23 lines
1.0 KiB
Diff
23 lines
1.0 KiB
Diff
--- a/src/tbbmalloc/proxy.cpp 2026-03-27 10:55:33.235747857 +0100
|
|
+++ b/src/tbbmalloc/proxy.cpp 2026-03-27 11:06:44.816616969 +0100
|
|
@@ -24,7 +24,8 @@
|
|
// of aligned_alloc as required by new C++ standard, this makes it hard to
|
|
// redefine aligned_alloc here. However, running on systems with new libc
|
|
// version, it still needs it to be redefined, thus tricking system headers
|
|
-#if defined(__GLIBC_PREREQ) && !__GLIBC_PREREQ(2, 16) && _GLIBCXX_HAVE_ALIGNED_ALLOC
|
|
+#if defined(__GLIBC_PREREQ)
|
|
+#if !__GLIBC_PREREQ(2, 16) && _GLIBCXX_HAVE_ALIGNED_ALLOC
|
|
// tell <cstdlib> that there is no aligned_alloc
|
|
#undef _GLIBCXX_HAVE_ALIGNED_ALLOC
|
|
// trick <stdlib.h> to define another symbol instead
|
|
@@ -32,7 +33,8 @@
|
|
// Fix the state and undefine the trick
|
|
#include <cstdlib>
|
|
#undef aligned_alloc
|
|
-#endif // defined(__GLIBC_PREREQ)&&!__GLIBC_PREREQ(2, 16)&&_GLIBCXX_HAVE_ALIGNED_ALLOC
|
|
+#endif // !__GLIBC_PREREQ(2, 16) && _GLIBCXX_HAVE_ALIGNED_ALLOC
|
|
+#endif // defined(__GLIBC_PREREQ)
|
|
#endif // __linux__ && !__ANDROID__
|
|
|
|
#include "proxy.h"
|