diff options
| author | Julien Nabet <serval2412@yahoo.fr> | 2016-12-20 09:11:45 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-12-20 09:27:06 +0000 |
| commit | e1d892b0cd0df500a1ea53d4c227f9a6fe943fdd (patch) | |
| tree | dc2be16b1fd6f0d60f4beccf0e94e5305413be42 /vcl | |
| parent | 5e63617ef934d3602bbc22f0f01c77b024347e60 (diff) | |
vcl: fix Android build
lround() is missing in the std namespace on the broken Android toolchain, work
it around.
(same as https://cgit.freedesktop.org/libreoffice/core/commit/?id=0cb7d76bc5552245642ba423a87831cd9e0b2b92)
Change-Id: I84c97e6d6bcbc193565c01db3011eb9d4edba6a1
Reviewed-on: https://gerrit.libreoffice.org/32216
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
Tested-by: Julien Nabet <serval2412@yahoo.fr>
(cherry picked from commit 456363919105253dd344b80b3ad3f649662c5658)
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/gdi/CommonSalLayout.cxx | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/vcl/source/gdi/CommonSalLayout.cxx b/vcl/source/gdi/CommonSalLayout.cxx index 1be067324df4..6358a073c576 100644 --- a/vcl/source/gdi/CommonSalLayout.cxx +++ b/vcl/source/gdi/CommonSalLayout.cxx @@ -30,6 +30,17 @@ #include <salgdi.hxx> #include <unicode/uchar.h> +#if defined(ANDROID) +namespace std +{ +template<typename T> +T lround(T x) +{ + return ::lround(x); +} +} +#endif + static hb_blob_t* getFontTable(hb_face_t* /*face*/, hb_tag_t nTableTag, void* pUserData) { |