blob: 558b3fc80d4795a2b97a38d516a084c0f131b8f5 (
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 2017-04-19 19:06:37 UTC
+++ skia/ext/SkMemory_new_handler.cpp
@@ -68,7 +68,7 @@ static void* sk_malloc_nothrow(size_t si
// TODO(b.kelemen): we should always use UncheckedMalloc but currently it
// doesn't work as intended everywhere.
void* result;
-#if defined(OS_IOS)
+#if defined(OS_IOS) || defined(OS_FREEBSD)
result = malloc(size);
#else
// It's the responsibility of the caller to check the return value.
@@ -95,7 +95,7 @@ void* sk_calloc(size_t size) {
// TODO(b.kelemen): we should always use UncheckedCalloc but currently it
// doesn't work as intended everywhere.
void* result;
-#if defined(OS_IOS)
+#if defined(OS_IOS) || defined(OS_FREEBSD)
result = calloc(1, size);
#else
// It's the responsibility of the caller to check the return value.
|