diff options
Diffstat (limited to 'chromium/base/process/memory_linux.cc')
| -rw-r--r-- | chromium/base/process/memory_linux.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/chromium/base/process/memory_linux.cc b/chromium/base/process/memory_linux.cc index 985bc54eb64..9a2213e9535 100644 --- a/chromium/base/process/memory_linux.cc +++ b/chromium/base/process/memory_linux.cc @@ -60,6 +60,7 @@ void* __libc_pvalloc(size_t size); #endif void* __libc_memalign(size_t alignment, size_t size); +#if !defined(TOOLKIT_QT) // QTBUG-61521,QTBUG-60565 // Overriding the system memory allocation functions: // // For security reasons, we want malloc failures to be fatal. Too much code @@ -129,6 +130,7 @@ int posix_memalign(void** ptr, size_t alignment, size_t size) { *ptr = memalign(alignment, size); return 0; } +#endif // TOOLKIT_QT } // extern C |