strepsirrhini/libreoffice-online
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix build for MOBILEAPP

Browse source 
Change-Id: I0903f13438493d167c263020d923536b4de71e5d
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/90385
Tested-by: Tor Lillqvist <tml@collabora.com>
Reviewed-by: Tor Lillqvist <tml@collabora.com>
This commit is contained in:
Tor Lillqvist 2020-03-12 15:13:28 +02:00
parent 57cca53b6a
commit 47d22d538a
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
kit/Kit.cpp
View file

@ -2149,12 +2149,14 @@ protected:
LOG_DBG("CreateSession failed."); LOG_DBG("CreateSession failed.");
} }
} }
#if !MOBILEAPP
else if (tokens.equals(0, "exit")) else if (tokens.equals(0, "exit"))
{ {
LOG_INF("Terminating immediately due to parent 'exit' command."); LOG_INF("Terminating immediately due to parent 'exit' command.");
Log::shutdown(); Log::shutdown();
std::_Exit(EX_SOFTWARE); std::_Exit(EX_SOFTWARE);
} }
#endif
else if (tokens.equals(0, "tile") || tokens.equals(0, "tilecombine") || tokens.equals(0, "canceltiles") || else if (tokens.equals(0, "tile") || tokens.equals(0, "tilecombine") || tokens.equals(0, "canceltiles") ||
tokens.equals(0, "paintwindow") || tokens.equals(0, "resizewindow") || tokens.equals(0, "paintwindow") || tokens.equals(0, "resizewindow") ||
LOOLProtocol::getFirstToken(tokens[0], '-') == "child") LOOLProtocol::getFirstToken(tokens[0], '-') == "child")

3
wsd/DocumentBroker.hpp
View file

@ -108,6 +108,7 @@ public:
try try
{ {
#if !MOBILEAPP // There is no "child process" in a mobile app
LOG_DBG("Closing ChildProcess [" << _pid << "]."); LOG_DBG("Closing ChildProcess [" << _pid << "].");
// Request the child to exit // Request the child to exit
@ -116,7 +117,7 @@ public:
LOG_DBG("Stopping ChildProcess [" << _pid << "] by sending 'exit' command."); LOG_DBG("Stopping ChildProcess [" << _pid << "] by sending 'exit' command.");
sendTextFrame("exit"); sendTextFrame("exit");
} }
#endif
// Shutdown the socket. // Shutdown the socket.
if (_ws) if (_ws)
_ws->shutdown(); _ws->shutdown();