summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2016-06-24 21:07:33 +0200
committerMichael Stahl <mstahl@redhat.com>2016-06-24 21:08:08 +0200
commitb72c14f68b317b27be12a2432cdeae351537d57a (patch)
treea4c099c2a8a1c0cd27f46877c2956ab1acf0e2af
parentd56dc64795dcd913d5fa663275bf34b75a0c82e6 (diff)
libzmf: blind fix hack attempt to work around buggy android headers
Change-Id: Ie7b265e909389ae80d8ced3d803d7e355cda2211
-rw-r--r--external/libzmf/0001-add-missing-include.patch.113
1 files changed, 12 insertions, 1 deletions
diff --git a/external/libzmf/0001-add-missing-include.patch.1 b/external/libzmf/0001-add-missing-include.patch.1
index db2a5c301ef5..c5ddfe9bcafd 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>