[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - vcl/source

[Julien Nabet]

 vcl/source/gdi/CommonSalLayout.cxx |   11 +++++++++++
 1 file changed, 11 insertions(+)

New commits:
commit e1d892b0cd0df500a1ea53d4c227f9a6fe943fdd
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Tue Dec 20 09:11:45 2016 +0100

    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 at yahoo.fr>
    Tested-by: Julien Nabet <serval2412 at yahoo.fr>
    (cherry picked from commit 456363919105253dd344b80b3ad3f649662c5658)

diff --git a/vcl/source/gdi/CommonSalLayout.cxx b/vcl/source/gdi/CommonSalLayout.cxx
index 1be0673..6358a07 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)
 {