diff options
| author | Kacper Kasper <kacperkasper@gmail.com> | 2018-02-25 02:55:15 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2018-03-05 14:17:27 +0100 |
| commit | 9c036b1d3db253a1fd43ce76ce1d919e2029af59 (patch) | |
| tree | 6e5130faa9421c0c093059b5cff08a4356407d28 /bridges | |
| parent | 73312eaff10b19d1286c225ee335451e1800df4a (diff) | |
Make LibreOffice buildable on Haiku.
* Obviously VCL wiring is missing, but most components do build.
Change-Id: Ie853ada1423a8f4c2b647be59cd47a7730c42978
Reviewed-on: https://gerrit.libreoffice.org/50293
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Diffstat (limited to 'bridges')
| -rw-r--r-- | bridges/inc/vtablefactory.hxx | 3 | ||||
| -rw-r--r-- | bridges/source/cpp_uno/shared/vtablefactory.cxx | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/bridges/inc/vtablefactory.hxx b/bridges/inc/vtablefactory.hxx index 991716b423e8..70c87c385952 100644 --- a/bridges/inc/vtablefactory.hxx +++ b/bridges/inc/vtablefactory.hxx @@ -30,7 +30,8 @@ /*See: http://people.redhat.com/drepper/selinux-mem.html*/ #if defined(LINUX) || defined(OPENBSD) || defined(FREEBSD) \ - || defined(NETBSD) || defined(DRAGONFLY) || defined (ANDROID) + || defined(NETBSD) || defined(DRAGONFLY) || defined (ANDROID) \ + || defined(HAIKU) #define USE_DOUBLE_MMAP #endif diff --git a/bridges/source/cpp_uno/shared/vtablefactory.cxx b/bridges/source/cpp_uno/shared/vtablefactory.cxx index 2c289ea58657..9e3a91fb0a93 100644 --- a/bridges/source/cpp_uno/shared/vtablefactory.cxx +++ b/bridges/source/cpp_uno/shared/vtablefactory.cxx @@ -63,7 +63,7 @@ extern "C" void * allocExec( { std::size_t pagesize; #if defined SAL_UNX -#if defined FREEBSD || defined NETBSD || defined OPENBSD || defined DRAGONFLY +#if defined FREEBSD || defined NETBSD || defined OPENBSD || defined DRAGONFLY || defined HAIKU pagesize = getpagesize(); #else pagesize = sysconf(_SC_PAGESIZE); |