wsd/LOOLWSD.cpp | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
New commits:
commit d7453ac243508b96fcda32a21a8de156d6242df6
Author: Tor Lillqvist <t...@collabora.com>
AuthorDate: Wed Jul 15 12:44:52 2020 +0300
Commit: Tor Lillqvist <t...@collabora.com>
CommitDate: Wed Jul 15 12:59:31 2020 +0200
Attempt to fix Android build: endLoadResult() can't be inside #if MOBILEAPP
Also helps the iOS build, but there is another recent change that
broke it more.
Change-Id: If750bfa3e89ee07d97a91996223012e309b0b712
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98811
Tested-by: Tor Lillqvist <t...@collabora.com>
Reviewed-by: Tor Lillqvist <t...@collabora.com>
diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index 1df218e83..7c353e6b1 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -690,6 +690,13 @@ inline std::string getServiceURI(const std::string &sub,
bool asAdmin = false)
#endif
+} // anonymous namespace
+
+#endif // MOBILEAPP
+
+namespace
+{
+
void sendLoadResult(std::shared_ptr<ClientSession> clientSession, bool success,
const std::string &errorMsg)
{
@@ -706,8 +713,6 @@ void sendLoadResult(std::shared_ptr<ClientSession>
clientSession, bool success,
} // anonymous namespace
-#endif // MOBILEAPP
-
std::atomic<uint64_t> LOOLWSD::NextConnectionId(1);
#if !MOBILEAPP
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
