[Libreoffice-commits] core.git: vcl/headless

[jan Iversen]

 vcl/headless/svpinst.cxx |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 9c8cc8e46c917042ca85d392f175b320205c0f7e
Author: jan Iversen <jani at libreoffice.org>
Date:   Wed Feb 28 13:06:02 2018 +0100

    iOS, removed read to pipes
    
    needed to run iOS
    
    Change-Id: I1176ce24023cde21846c71ffadb1bf01cb2c8399

diff --git a/vcl/headless/svpinst.cxx b/vcl/headless/svpinst.cxx
index 096dcb252a3c..61fc93883f6a 100644
--- a/vcl/headless/svpinst.cxx
+++ b/vcl/headless/svpinst.cxx
@@ -327,7 +327,11 @@ void SvpSalYieldMutex::doAcquire(sal_uInt32 const nLockCount)
                 m_bNoYieldLock = true;
                 bool const bEvents = pInst->DoYield(false, request == SvpRequest::MainThreadDispatchAllEvents);
                 m_bNoYieldLock = false;
+#ifdef IOS
+                (void)bEvents;
+#else
                 write(m_FeedbackFDs[1], &bEvents, sizeof(bool));
+#endif
             }
         }
         while (true);
@@ -454,10 +458,11 @@ bool SvpSalInstance::DoYield(bool bWait, bool bHandleAllCurrentEvents)
                 : SvpRequest::MainThreadDispatchOneEvent);
 
         bool bDidWork(false);
+#ifndef IOS
         // blocking read (for synchronisation)
         auto const nRet = read(pMutex->m_FeedbackFDs[0], &bDidWork, sizeof(bool));
         assert(nRet == 1); (void) nRet;
-
+#endif
         if (!bDidWork && bWait)
         {
             // block & release YieldMutex until the main thread does something