summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2016-11-17 14:21:54 +0100
committerMiklos Vajna <vmiklos@collabora.co.uk>2016-11-17 14:22:14 +0100
commitc84d8ebb86e403a876eadd77c7fd9bdab90566f8 (patch)
treec366b0f03bcb85e49fc6686b3e09c66caa138600 /vcl
parent90646b4966c73637ddf592acd05b3091fb3fa41f (diff)
vcl: work around missing std::fmax() on Android
Change-Id: Iaa4e6aa84c163f2ec5541f233cf7593c0a501b5e
Diffstat (limited to 'vcl')
-rw-r--r--vcl/unx/generic/gdi/cairotextrender.cxx10
1 files changed, 10 insertions, 0 deletions
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 <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;