external/libzmf/0001-add-missing-include.patch.1 | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
New commits:
commit b72c14f68b317b27be12a2432cdeae351537d57a
Author: Michael Stahl <mst...@redhat.com>
Date: Fri Jun 24 21:07:33 2016 +0200
libzmf: blind fix hack attempt to work around buggy android headers
Change-Id: Ie7b265e909389ae80d8ced3d803d7e355cda2211
diff --git a/external/libzmf/0001-add-missing-include.patch.1
b/external/libzmf/0001-add-missing-include.patch.1
index db2a5c3..c5ddfe9 100644
--- a/external/libzmf/0001-add-missing-include.patch.1
+++ b/external/libzmf/0001-add-missing-include.patch.1
@@ -12,12 +12,23 @@ diff --git a/src/lib/ZMFCollector.cpp
b/src/lib/ZMFCollector.cpp
index ded93c7..7e024b3 100644
--- a/src/lib/ZMFCollector.cpp
+++ b/src/lib/ZMFCollector.cpp
-@@ -9,6 +9,8 @@
+@@ -9,6 +9,19 @@
#include "ZMFCollector.h"
+#include <cmath>
+
++#if defined(ANDROID)
++namespace std
++{
++template<typename T>
++T hypot(T x, T y)
++{
++ return ::hypot(x, y);
++}
++}
++#endif
++
#include <boost/math/constants/constants.hpp>
#include <boost/variant.hpp>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
