From c84d8ebb86e403a876eadd77c7fd9bdab90566f8 Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Thu, 17 Nov 2016 14:21:54 +0100 Subject: [PATCH] vcl: work around missing std::fmax() on Android Change-Id: Iaa4e6aa84c163f2ec5541f233cf7593c0a501b5e --- vcl/unx/generic/gdi/cairotextrender.cxx | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/vcl/unx/generic/gdi/cairotextrender.cxx b/vcl/unx/generic/gdi/cairotextrender.cxx index 974b584f7896..3c571f77bd0a 100644 --- a/vcl/unx/generic/gdi/cairotextrender.cxx +++ b/vcl/unx/generic/gdi/cairotextrender.cxx @@ -44,6 +44,16 @@ #include #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;