mirror of https://github.com/microsoft/vcpkg.git
49 lines
2.0 KiB
Diff
49 lines
2.0 KiB
Diff
diff --git a/src/base/SkAutoLocaleSetter.h b/src/base/SkAutoLocaleSetter.h
|
|
index 90bcbb32bc..68a0f8a9e3 100644
|
|
--- a/src/base/SkAutoLocaleSetter.h
|
|
+++ b/src/base/SkAutoLocaleSetter.h
|
|
@@ -27,7 +27,7 @@
|
|
#define HAVE_XLOCALE 0
|
|
#endif
|
|
|
|
-#if defined(SK_BUILD_FOR_ANDROID) || defined(__UCLIBC__) || defined(_NEWLIB_VERSION)
|
|
+#if defined(SK_BUILD_FOR_ANDROID) || defined(__UCLIBC__) || defined(_NEWLIB_VERSION) || defined(__NetBSD__)
|
|
#define HAVE_LOCALE_T 0
|
|
#else
|
|
#define HAVE_LOCALE_T 1
|
|
diff --git a/src/ports/SkMemory_malloc.cpp b/src/ports/SkMemory_malloc.cpp
|
|
index d784af53ef..8bb21406dd 100644
|
|
--- a/src/ports/SkMemory_malloc.cpp
|
|
+++ b/src/ports/SkMemory_malloc.cpp
|
|
@@ -15,7 +15,7 @@
|
|
|
|
#if defined(SK_BUILD_FOR_MAC) || defined(SK_BUILD_FOR_IOS)
|
|
#include <malloc/malloc.h>
|
|
-#elif defined(SK_BUILD_FOR_ANDROID) || defined(SK_BUILD_FOR_UNIX)
|
|
+#elif defined(SK_BUILD_FOR_ANDROID) || defined(SK_BUILD_FOR_UNIX) && !defined(__OpenBSD__) && !defined(__NetBSD__)
|
|
#include <malloc.h>
|
|
#elif defined(SK_BUILD_FOR_WIN)
|
|
#include <malloc.h>
|
|
@@ -126,7 +126,7 @@ size_t sk_malloc_size(void* addr, size_t size) {
|
|
#elif defined(SK_BUILD_FOR_ANDROID) && __ANDROID_API__ >= 17
|
|
completeSize = malloc_usable_size(addr);
|
|
SkASSERT(completeSize >= size);
|
|
- #elif defined(SK_BUILD_FOR_UNIX)
|
|
+ #elif defined(SK_BUILD_FOR_UNIX) && !defined(__OpenBSD__) && !defined(__NetBSD__)
|
|
completeSize = malloc_usable_size(addr);
|
|
SkASSERT(completeSize >= size);
|
|
#elif defined(SK_BUILD_FOR_WIN)
|
|
diff --git a/src/ports/SkOSFile_posix.cpp b/src/ports/SkOSFile_posix.cpp
|
|
index 1be1330790..8af0a6d6a7 100644
|
|
--- a/src/ports/SkOSFile_posix.cpp
|
|
+++ b/src/ports/SkOSFile_posix.cpp
|
|
@@ -25,7 +25,7 @@
|
|
#endif
|
|
|
|
void sk_fsync(FILE* f) {
|
|
-#if !defined(SK_BUILD_FOR_ANDROID) && !defined(__UCLIBC__) && !defined(_NEWLIB_VERSION)
|
|
+#if !defined(SK_BUILD_FOR_ANDROID) && !defined(__UCLIBC__) && !defined(_NEWLIB_VERSION) && !defined(__OpenBSD__)
|
|
int fd = fileno(f);
|
|
fsync(fd);
|
|
#endif
|