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

Tor Lillqvist (via logerrit) logerrit at kemper.freedesktop.org
Tue Apr 6 06:45:57 UTC 2021


 vcl/headless/svpinst.cxx |    2 --
 1 file changed, 2 deletions(-)

New commits:
commit 122a213f12bc73589bef92a9a386196345e78abc
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Fri Sep 20 15:03:12 2019 +0300
Commit:     Tor Lillqvist <tml at iki.fi>
CommitDate: Tue Apr 6 09:45:14 2021 +0300

    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 9654243f5ac3..46f1b940c926 100644
--- a/vcl/headless/svpinst.cxx
+++ b/vcl/headless/svpinst.cxx
@@ -330,9 +330,7 @@ void SvpSalInstance::ProcessEvent( SalUserEvent aEvent )
 
 SvpSalYieldMutex::SvpSalYieldMutex()
 {
-#ifndef IOS
     m_FeedbackFDs[0] = m_FeedbackFDs[1] = -1;
-#endif
 }
 
 SvpSalYieldMutex::~SvpSalYieldMutex()


More information about the Libreoffice-commits mailing list