diff options
Diffstat (limited to 'www/chromium/files/patch-base_process_memory.cc')
| -rw-r--r-- | www/chromium/files/patch-base_process_memory.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/www/chromium/files/patch-base_process_memory.cc b/www/chromium/files/patch-base_process_memory.cc index 67b524cc8e85..13cd43d79b6c 100644 --- a/www/chromium/files/patch-base_process_memory.cc +++ b/www/chromium/files/patch-base_process_memory.cc @@ -1,10 +1,10 @@ ---- base/process/memory.cc.orig 2022-02-07 13:39:41 UTC +--- base/process/memory.cc.orig 2022-02-28 16:54:41 UTC +++ base/process/memory.cc -@@ -63,14 +63,16 @@ NOINLINE void OnNoMemoryInternal(size_t size) { +@@ -65,14 +65,16 @@ NOINLINE void OnNoMemoryInternal(size_t size) { } // namespace internal -+#if !defined(OS_BSD) ++#if !BUILDFLAG(IS_BSD) void TerminateBecauseOutOfMemory(size_t size) { internal::OnNoMemoryInternal(size); } @@ -13,8 +13,8 @@ // Defined in memory_mac.mm for macOS + use_allocator="none". In case of // USE_PARTITION_ALLOC_AS_MALLOC, no need to route the call to the system // default calloc of macOS. --#if !defined(OS_APPLE) || BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) -+#if (!defined(OS_APPLE) && !defined(OS_BSD)) || BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) +-#if !BUILDFLAG(IS_APPLE) || BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) ++#if (!BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_BSD)) || BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) bool UncheckedCalloc(size_t num_items, size_t size, void** result) { const size_t alloc_size = num_items * size; |