summaryrefslogtreecommitdiff
path: root/desktop
diff options
context:
space:
mode:
authorJulien Nabet <serval2412@yahoo.fr>2016-10-16 14:58:10 +0200
committerJulien Nabet <serval2412@yahoo.fr>2016-10-16 16:40:44 +0000
commit9a0e3d1de75a1986d614a52f1f41276411709cce (patch)
tree4845d0881de2c948f20f8d6a6df740d8a55b9675 /desktop
parent6d4f7734ad63998b067f50b6564639a527bf34e3 (diff)
fix Android build (desktop)
stol is missing in the std namespace on the broken Android toolchain, work it around. (I copycat https://cgit.freedesktop.org/libreoffice/core/commit/?id=c2673a358c78b864c1276f7956d5a348003b7a02) Change-Id: I4d85b81abf5d72c08d9aae72638823b8a0484cc1 Reviewed-on: https://gerrit.libreoffice.org/29921 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
Diffstat (limited to 'desktop')
-rw-r--r--desktop/source/lib/init.cxx6
1 files changed, 6 insertions, 0 deletions
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 4e213bfa12b5..a7a6ea944a03 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -109,6 +109,12 @@ std::string to_string(T x)
stream << x;
return stream.str();
}
+
+long stol( const std::string& str, std::size_t* /*pos*/ = 0, int base = 10 );
+{
+ char* end;
+ return strtol(str.c_str(), &end, base);
+}
}
#endif