diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-11-07 08:57:33 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-11-07 08:57:33 +0100 |
| commit | 4e3e87e88d2d450c87680b31f12906bc41da79f1 (patch) | |
| tree | a5ebb42b8717111f5299b1b5f7548091c9342394 /jurt | |
| parent | 9ec4c4ab052c66e9e25c9893bba33b8dee258484 (diff) | |
Adapt jurt staticsalhack to MACOSX
Change-Id: I0525b68cdb097edd3241809ae0dc9c22e1ad9814
Diffstat (limited to 'jurt')
| -rw-r--r-- | jurt/Library_jpipe.mk | 6 | ||||
| -rw-r--r-- | jurt/source/pipe/staticsalhack.cxx | 19 |
2 files changed, 25 insertions, 0 deletions
diff --git a/jurt/Library_jpipe.mk b/jurt/Library_jpipe.mk index 3ddac8cd14d4..dbe0b8937a56 100644 --- a/jurt/Library_jpipe.mk +++ b/jurt/Library_jpipe.mk @@ -72,6 +72,12 @@ $(eval $(call gb_Library_use_externals,jpipe, \ boost_headers \ )) +ifeq ($(OS),MACOSX) +$(eval $(call gb_Library_use_system_darwin_frameworks,jpipe, \ + CoreFoundation \ +)) +endif + $(eval $(call gb_Library_add_libs,jpipe, \ $(if $(filter-out $(OS),ANDROID),-lpthread) \ )) diff --git a/jurt/source/pipe/staticsalhack.cxx b/jurt/source/pipe/staticsalhack.cxx index 23afde168bda..a527d0965ce4 100644 --- a/jurt/source/pipe/staticsalhack.cxx +++ b/jurt/source/pipe/staticsalhack.cxx @@ -13,6 +13,10 @@ #undef SAL_LOG_INFO #undef SAL_LOG_WARN +#include <sal/config.h> + +#include <cstdlib> + #include <sal/rtl/string.cxx> #include <sal/rtl/ustring.cxx> @@ -57,4 +61,19 @@ #include <sal/textenc/textenc.cxx> #include <sal/textenc/unichars.cxx> +#if defined MACOSX +#include <sal/osl/unx/osxlocale.cxx> +#include <sal/osl/unx/system.cxx> +#endif + +// Called from FullTextEncodingData::get in sal/textenc/textenc.cxx, but only +// defined for ANDROID (in ANDROID-specific sal/textenc/tables.cxx); would even +// work to leave it undefined for LINUX due to no '-z defs' under -fsanitize=* +// (solenv/gbuild/platform/linux.mk), but not for MACOSX: +extern "C" ImplTextEncodingData const * sal_getFullTextEncodingData( + rtl_TextEncoding) +{ + std::abort(); +} + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |