mirror of
https://git.freebsd.org/ports.git
synced 2025-06-10 07:10:32 -04:00
d90bf58cf8
- Make existing patches apply cleanly Changelog: https://chromium.googlesource.com/chromium/src/+log/72.0.3626.121..73.0.3683.86?pretty=fuller&n=10000 Submitted by: Matthias Wolf MFH: 2019Q2
20 lines
547 B
C++
20 lines
547 B
C++
--- base/process/memory.cc.orig 2019-03-11 22:00:51 UTC
|
|
+++ base/process/memory.cc
|
|
@@ -10,7 +10,7 @@
|
|
namespace base {
|
|
|
|
// Defined in memory_win.cc for Windows.
|
|
-#if !defined(OS_WIN)
|
|
+#if !defined(OS_WIN) && !defined(OS_BSD)
|
|
|
|
namespace {
|
|
|
|
@@ -31,7 +31,7 @@ void TerminateBecauseOutOfMemory(size_t size) {
|
|
#endif
|
|
|
|
// Defined in memory_mac.mm for Mac.
|
|
-#if !defined(OS_MACOSX)
|
|
+#if !defined(OS_MACOSX) && !defined(OS_BSD)
|
|
|
|
bool UncheckedCalloc(size_t num_items, size_t size, void** result) {
|
|
const size_t alloc_size = num_items * size;
|