blob: 32a9df44057adf0af74f12d38e3fa2b10fbfd785 (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
|
--- skia/ext/SkMemory_new_handler.cpp.orig 2025-03-24 20:50:14 UTC
+++ skia/ext/SkMemory_new_handler.cpp
@@ -24,7 +24,7 @@
#include <windows.h>
#elif BUILDFLAG(IS_APPLE)
#include <malloc/malloc.h>
-#else
+#elif !BUILDFLAG(IS_BSD)
#include <malloc.h>
#endif
@@ -110,7 +110,7 @@ static void* malloc_nothrow(size_t size, int debug_sen
// TODO(b.kelemen): we should always use UncheckedMalloc but currently it
// doesn't work as intended everywhere.
void* result;
-#if BUILDFLAG(IS_IOS)
+#if BUILDFLAG(IS_IOS) || BUILDFLAG(IS_BSD)
result = malloc(size);
#else
// It's the responsibility of the caller to check the return value.
|
