[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-4' - wsd/DocumentBroker.cpp wsd/LOOLWSD.cpp
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Fri May 3 14:07:27 UTC 2019
wsd/DocumentBroker.cpp | 2 +-
wsd/LOOLWSD.cpp | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 063a8543384139106be1881ef412b9c8a2b95862
Author: Michael Meeks <michael.meeks at collabora.com>
AuthorDate: Fri May 3 15:06:41 2019 +0100
Commit: Michael Meeks <michael.meeks at collabora.com>
CommitDate: Fri May 3 15:06:41 2019 +0100
Fixup remaining #ifndef MOBILE instances..
Change-Id: I2ac50b93d9ef7cf083a02b4eb6ea0825d42a793f
diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp
index 1d70693bd..b6d6bef07 100644
--- a/wsd/DocumentBroker.cpp
+++ b/wsd/DocumentBroker.cpp
@@ -340,7 +340,7 @@ void DocumentBroker::pollThread()
if (false)
;
-#ifndef MOBILEAPP
+#if !MOBILEAPP
// Remove idle documents after 1 hour.
else if ((isLoaded() && getIdleTimeSecs() >= IdleDocTimeoutSecs))
{
diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index eb2074f7e..4421afe9e 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -187,7 +187,7 @@ Socket::Type ClientPortProto = Socket::Type::All;
/// INET address to listen on
ServerSocket::Type ClientListenAddr = ServerSocket::Type::Public;
-#ifndef MOBILEAPP
+#if !MOBILEAPP
/// UDS address for kits to connect to.
std::string MasterLocation;
#endif
@@ -2925,7 +2925,7 @@ public:
SocketPoll::InhibitThreadChecks = true;
os << "LOOLWSDServer:\n"
-#ifndef MOBILEAPP
+#if !MOBILEAPP
<< " Ports: server " << ClientPortNumber
<< " prisoner " << MasterLocation << "\n"
<< " SSL: " << (LOOLWSD::isSSLEnabled() ? "https" : "http") << "\n"
More information about the Libreoffice-commits
mailing list