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

[Tor Lillqvist (via logerrit)]

 vcl/headless/svpinst.cxx     |    2 --
 vcl/inc/headless/svpinst.hxx |    2 --
 2 files changed, 4 deletions(-)

New commits:
commit 1725eda0be7546702007c8627e907a95924a50e4
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Fri Sep 20 15:03:12 2019 +0300
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Fri Sep 20 14:08:54 2019 +0200

    Revert "m_FeedbackFDs is unused on iOS"
    
    It is not unused now any longer. However it is unclear whether it
    actually is needed or not. I was able to build and run the iOS app
    even while it was unused.
    
    This reverts commit 629f9ff63bf3a1e16ed38a737a7fdd074b9c0ca7.
    
    Change-Id: I7c1d1abb6dae5f0739b112883149ea83ca4fb975
    Reviewed-on: https://gerrit.libreoffice.org/79285
    Reviewed-by: Tor Lillqvist <tml at collabora.com>
    Tested-by: Tor Lillqvist <tml at collabora.com>

diff --git a/vcl/headless/svpinst.cxx b/vcl/headless/svpinst.cxx
index b3b082af98b3..22ec77ec8c7f 100644
--- a/vcl/headless/svpinst.cxx
+++ b/vcl/headless/svpinst.cxx
@@ -295,9 +295,7 @@ void SvpSalInstance::ProcessEvent( SalUserEvent aEvent )
 
 SvpSalYieldMutex::SvpSalYieldMutex()
 {
-#ifndef IOS
     m_FeedbackFDs[0] = m_FeedbackFDs[1] = -1;
-#endif
 }
 
 SvpSalYieldMutex::~SvpSalYieldMutex()
diff --git a/vcl/inc/headless/svpinst.hxx b/vcl/inc/headless/svpinst.hxx
index a57f57234a50..2c3d21cde8e8 100644
--- a/vcl/inc/headless/svpinst.hxx
+++ b/vcl/inc/headless/svpinst.hxx
@@ -73,9 +73,7 @@ private:
     // at least one subclass of SvpSalInstance (GTK3) that doesn't use them.
     friend class SvpSalInstance;
     // members for communication from main thread to non-main thread
-#ifndef IOS
     int                     m_FeedbackFDs[2];
-#endif
     osl::Condition          m_NonMainWaitingYieldCond;
     // members for communication from non-main thread to main thread
     bool                    m_bNoYieldLock = false; // accessed only on main thread