Differential D38165 Diff 118368 www/qt5-webengine/files/patch-src_3rdparty_chromium_base_process_memory.cc
Changeset View
Changeset View
Standalone View
Standalone View
www/qt5-webengine/files/patch-src_3rdparty_chromium_base_process_memory.cc
| --- src/3rdparty/chromium/base/process/memory.cc.orig 2018-11-13 18:25:11 UTC | --- src/3rdparty/chromium/base/process/memory.cc.orig 2021-12-15 16:12:54 UTC | ||||
| +++ src/3rdparty/chromium/base/process/memory.cc | +++ src/3rdparty/chromium/base/process/memory.cc | ||||
| @@ -10,7 +10,7 @@ | @@ -55,7 +55,7 @@ NOINLINE void OnNoMemoryInternal(size_t size) { | ||||
| namespace base { | } // namespace internal | ||||
| // Defined in memory_win.cc for Windows. | // Defined in memory_win.cc for Windows. | ||||
| -#if !defined(OS_WIN) | -#if !defined(OS_WIN) | ||||
| +#if !defined(OS_WIN) && !defined(OS_BSD) | +#if !defined(OS_WIN) && !defined(OS_BSD) | ||||
| namespace { | namespace { | ||||
| @@ -31,7 +31,7 @@ void TerminateBecauseOutOfMemory(size_t size) { | @@ -74,7 +74,7 @@ void TerminateBecauseOutOfMemory(size_t size) { | ||||
| #endif | #endif // !defined(OS_WIN) | ||||
| // Defined in memory_mac.mm for Mac. | // Defined in memory_mac.mm for Mac. | ||||
| -#if !defined(OS_MACOSX) | -#if !defined(OS_APPLE) | ||||
| +#if !defined(OS_MACOSX) && !defined(OS_BSD) | +#if !defined(OS_APPLE) && !defined(OS_BSD) | ||||
| bool UncheckedCalloc(size_t num_items, size_t size, void** result) { | bool UncheckedCalloc(size_t num_items, size_t size, void** result) { | ||||
| const size_t alloc_size = num_items * size; | const size_t alloc_size = num_items * size; | ||||