[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - vcl/headless

[Tor Lillqvist (via logerrit)]

 vcl/headless/svpinst.cxx |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

New commits:
commit 915cee6965a39870ae7f2b5bd5f34dc7aa732f80
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Wed Apr 24 13:25:08 2019 +0300
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Fri Aug 9 08:13:30 2019 +0200

    tdf#124923: Remove unneeded iOS ifdeffery
    
    Original commit message:
    
        Now with "Unipoll" this actually caused the app to hang. Unclear
        whether this ifdef had ever been strictly needed. (But before
        "Unipoll" it did not cause any harm.)
    
    Unknown whether the app would have hung here in this branch or not.
    Anyway, good to have this commit here, too.
    
    (cherry picked from commit 6e246024c8b7ad3d8b953f92a2e5a01686f3a00e)
    
    Change-Id: I5cc399f76fcdb267eb96bf7790474c14f2ce9955
    Reviewed-on: https://gerrit.libreoffice.org/77176
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Tor Lillqvist <tml at collabora.com>

diff --git a/vcl/headless/svpinst.cxx b/vcl/headless/svpinst.cxx
index 080076c06989..98cdbd6f8c6a 100644
--- a/vcl/headless/svpinst.cxx
+++ b/vcl/headless/svpinst.cxx
@@ -172,9 +172,7 @@ void SvpSalInstance::Wakeup(SvpRequest const request)
         g_CheckedMutex = true;
     }
 #endif
-#ifdef IOS
-    (void)request;
-#else
+
     ImplSVData* pSVData = ImplGetSVData();
 
     if (pSVData->mpWakeCallback)
@@ -186,7 +184,6 @@ void SvpSalInstance::Wakeup(SvpRequest const request)
         pMutex->m_Request = request;
     pMutex->m_wakeUpMain = true;
     pMutex->m_WakeUpMainCond.notify_one();
-#endif
 }
 
 bool SvpSalInstance::CheckTimeout( bool bExecuteTimers )