19 lines
812 B
Diff
19 lines
812 B
Diff
|
--- src/tbbmalloc/proxy.cpp.orig 2018-10-17 14:05:31.311723013 +0200
|
||
|
|
+++ src/tbbmalloc/proxy.cpp 2018-10-17 14:06:32.972726194 +0200
|
||
|
|
@@ -28,6 +28,7 @@
|
||
|
|
// 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__)
|
||
|
|
#if defined(__GLIBC_PREREQ) && !__GLIBC_PREREQ(2, 16) && _GLIBCXX_HAVE_ALIGNED_ALLOC
|
||
|
|
// tell <cstdlib> that there is no aligned_alloc
|
||
|
|
#undef _GLIBCXX_HAVE_ALIGNED_ALLOC
|
||
|
|
@@ -37,6 +38,7 @@
|
||
|
|
#include <cstdlib>
|
||
|
|
#undef aligned_alloc
|
||
|
|
#endif // defined(__GLIBC_PREREQ)&&!__GLIBC_PREREQ(2, 16)&&_GLIBCXX_HAVE_ALIGNED_ALLOC
|
||
|
|
+#endif // defined(__GLIBC__)
|
||
|
|
#endif // __linux__ && !__ANDROID__
|
||
|
|
|
||
|
|
#include "proxy.h"
|