[Libreoffice-commits] core.git: vcl/unx

[Miklos Vajna]

 vcl/unx/generic/gdi/cairotextrender.cxx |   10 ++++++++++
 1 file changed, 10 insertions(+)

New commits:
commit c84d8ebb86e403a876eadd77c7fd9bdab90566f8
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Thu Nov 17 14:21:54 2016 +0100

    vcl: work around missing std::fmax() on Android
    
    Change-Id: Iaa4e6aa84c163f2ec5541f233cf7593c0a501b5e

diff --git a/vcl/unx/generic/gdi/cairotextrender.cxx b/vcl/unx/generic/gdi/cairotextrender.cxx
index 974b584..3c571f7 100644
--- a/vcl/unx/generic/gdi/cairotextrender.cxx
+++ b/vcl/unx/generic/gdi/cairotextrender.cxx
@@ -44,6 +44,16 @@
 #include <cairo-ft.h>
 #include "CommonSalLayout.hxx"
 
+#ifdef ANDROID
+namespace std
+{
+double fmax(double x, double y)
+{
+    return ::fmax(x, y);
+}
+}
+#endif
+
 namespace {
 
 typedef struct FT_FaceRec_* FT_Face;