Skip to content

Commit 72541fc

Browse files
Ashodcaolanm
authored andcommitted
wsd: remove MOBILEAPP directives
Change-Id: Ifcd40dc1fdfc774bf24fd9e58d64ded7fae54a68 Signed-off-by: Ashod Nakashian <[email protected]>
1 parent 7d78404 commit 72541fc

File tree

2 files changed

+21
-14
lines changed

2 files changed

+21
-14
lines changed

wsd/COOLWSD.cpp

Lines changed: 20 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -649,7 +649,12 @@ static void prespawnChildren()
649649
}
650650
}
651651

652-
#endif
652+
#else // MOBILEAPP
653+
static void prespawnChildren()
654+
{
655+
// Nothing to do.
656+
}
657+
#endif // MOBILEAPP
653658

654659
static size_t addNewChild(std::shared_ptr<ChildProcess> child)
655660
{
@@ -2670,20 +2675,22 @@ void COOLWSD::setLogLevelsOfKits(const std::string& level)
26702675
/// Really do the house-keeping
26712676
void PrisonPoll::wakeupHook()
26722677
{
2673-
#if !MOBILEAPP
2674-
THREAD_UNSAFE_DUMP_BEGIN
2675-
LOG_TRC("PrisonerPoll - wakes up with " << NewChildren.size() <<
2676-
" new children and " << DocBrokers.size() << " brokers and " <<
2677-
TotalOutstandingForks << " kits forking");
2678-
THREAD_UNSAFE_DUMP_END
2679-
2680-
if (!COOLWSD::checkAndRestoreForKit())
2678+
if constexpr (!Util::isMobileApp())
26812679
{
2682-
// No children have died.
2683-
// Make sure we have sufficient reserves.
2684-
prespawnChildren();
2680+
THREAD_UNSAFE_DUMP_BEGIN
2681+
LOG_TRC("PrisonerPoll - wakes up with " << NewChildren.size() << " new children and "
2682+
<< DocBrokers.size() << " brokers and "
2683+
<< TotalOutstandingForks << " kits forking");
2684+
THREAD_UNSAFE_DUMP_END
2685+
2686+
if (!COOLWSD::checkAndRestoreForKit())
2687+
{
2688+
// No children have died.
2689+
// Make sure we have sufficient reserves.
2690+
prespawnChildren();
2691+
}
26852692
}
2686-
#endif
2693+
26872694
std::unique_lock<std::mutex> docBrokersLock(DocBrokersMutex, std::defer_lock);
26882695
if (docBrokersLock.try_lock())
26892696
{

wsd/Storage.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ StorageBase::StorageType StorageBase::validate(const Poco::URI& uri,
185185
LOG_DBG("Local Storage is disabled in this build. Enable in the config file.");
186186
#endif // ENABLE_LOCAL_FILESYSTEM
187187
}
188-
#if !MOBILEAPP
188+
#if !MOBILEAPP // Breaks IOS when removed.
189189
else if (HostUtil::isWopiEnabled())
190190
{
191191
const auto& targetHost = uri.getHost();

0 commit comments

Comments
 (0)